bugfixes for debian, see #1

master
Marc Wäckerlin 15 years ago
parent 1f00d0e087
commit d371d773cc
  1. 13
      configure.in
  2. 2
      debian/rules
  3. 2
      src/libpcscxx.pc.in

@ -11,10 +11,13 @@ m4_define(x_minor, 0)
PACKAGENAME=x_packagename PACKAGENAME=x_packagename
MAJOR=x_major MAJOR=x_major
MINOR=x_minor MINOR=x_minor
LEAST="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
LEAST='$Revision$' for path in . .. ../..; do
LEAST=${LEAST#* } if svn info $path 2>&1 > /dev/null; then
LEAST=${LEAST% *} LEAST=$(LANG= svn info $path | sed -n 's/Revision: //p')
break;
fi
done
AM_INIT_AUTOMAKE($PACKAGENAME, $MAJOR.$MINOR.$LEAST, [marc@waeckerlin.org]) AM_INIT_AUTOMAKE($PACKAGENAME, $MAJOR.$MINOR.$LEAST, [marc@waeckerlin.org])
@ -30,7 +33,7 @@ AC_SUBST(LEAST)
# libtool versioning # libtool versioning
LIB_MAJOR=m4_eval(x_major+x_minor) LIB_MAJOR=m4_eval(x_major+x_minor)
LIB_MINOR=LEAST LIB_MINOR=$LEAST
LIB_LEAST=x_minor LIB_LEAST=x_minor
LIB_VERSION="${LIB_MAJOR}:${LIB_MINOR}:${LIB_LEAST}" LIB_VERSION="${LIB_MAJOR}:${LIB_MINOR}:${LIB_LEAST}"
AC_SUBST(LIB_VERSION) AC_SUBST(LIB_VERSION)

2
debian/rules vendored

@ -94,7 +94,7 @@ binary-arch: install
dh_fixperms dh_fixperms
# dh_perl # dh_perl
# dh_python # dh_python
# dh_makeshlibs dh_makeshlibs
dh_installdeb dh_installdeb
dh_shlibdeps dh_shlibdeps
dh_gencontrol dh_gencontrol

@ -1,4 +1,4 @@
prefix=@PREFIX@ prefix=@PACKAGENAME@
exec_prefix=${prefix} exec_prefix=${prefix}
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
includedir=${prefix}/include includedir=${prefix}/include

Loading…
Cancel
Save