From 6ad7e5d85ee16eb6b1fce07558103fd4af4c5129 Mon Sep 17 00:00:00 2001 From: Andreas Beckmann Date: Fri, 23 May 2014 16:02:10 +0200 Subject: install libmilter1.0.1 via debian/tmp and dh_install --- debian/configure.ac | 2 +- debian/libmilter.dirs.in | 1 - debian/libmilter.install.in | 1 + debian/rules | 6 +----- 4 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 debian/libmilter.dirs.in create mode 100644 debian/libmilter.install.in diff --git a/debian/configure.ac b/debian/configure.ac index a89f79d..a89444c 100644 --- a/debian/configure.ac +++ b/debian/configure.ac @@ -1683,7 +1683,7 @@ AC_CONFIG_FILES([control.m4],[ exit 1; fi; ]) -AC_CONFIG_FILES([libmilter${sm_libmilter_version}.dirs:libmilter.dirs.in]) +AC_CONFIG_FILES([libmilter${sm_libmilter_version}.install:libmilter.install.in]) AC_CONFIG_FILES([libmilter${sm_libmilter_version}.lintian-overrides:libmilter.lintian-overrides.in]) AC_CONFIG_FILES([libmilter${sm_libmilter_version}.preinst:libmilter.preinst.in]) AC_CONFIG_FILES([libmilter${sm_libmilter_version}.symbols:libmilter.symbols.in]) diff --git a/debian/libmilter.dirs.in b/debian/libmilter.dirs.in deleted file mode 100644 index b0137f6..0000000 --- a/debian/libmilter.dirs.in +++ /dev/null @@ -1 +0,0 @@ -.@libdir@ diff --git a/debian/libmilter.install.in b/debian/libmilter.install.in new file mode 100644 index 0000000..6c4e86c --- /dev/null +++ b/debian/libmilter.install.in @@ -0,0 +1 @@ +usr/lib/libmilter/libmilter.so.@sm_libmilter_version@ usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/rules b/debian/rules index a48744d..fce9612 100755 --- a/debian/rules +++ b/debian/rules @@ -357,11 +357,7 @@ common-install-arch:: for subdir in ${SM_SUBDIRS}; do \ if [ -d ${DEB_SRCDIR}/$${subdir} ]; then \ if [ "$${subdir}" = 'libmilter' ]; then \ - ${INSTALL} -d debian/libmilter${sm_libmilter_version}${libdir}/${DEB_HOST_MULTIARCH}; \ - (cd ${DEB_SRCDIR}/obj*/$${subdir} && \ - $(INSTALL) libmilter.so.${sm_libmilter_version} \ - ../../../../debian/libmilter${sm_libmilter_version}${libdir}/${DEB_HOST_MULTIARCH}/; \ - ); \ + : ; \ elif [ "$${subdir}" = 'mail.local' ] \ || [ "$${subdir}" = 'rmail' ]; then \ (cd ${DEB_SRCDIR}/obj*/$${subdir} && \ -- cgit v1.2.3