From 77609ea4f23fe3f134d7f87c488dd1f5cf13c5ed Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <anbe@debian.org>
Date: Fri, 23 May 2014 02:52:18 +0200
Subject: install libmilter-dev via debian/tmp and dh_install

---
 debian/configure.ac          | 1 -
 debian/libmilter-dev.dirs.in | 1 -
 debian/libmilter-dev.install | 2 ++
 debian/rules                 | 9 +++------
 4 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 debian/libmilter-dev.dirs.in
 create mode 100644 debian/libmilter-dev.install

diff --git a/debian/configure.ac b/debian/configure.ac
index 877a281..a89f79d 100644
--- a/debian/configure.ac
+++ b/debian/configure.ac
@@ -1687,7 +1687,6 @@ AC_CONFIG_FILES([libmilter${sm_libmilter_version}.dirs:libmilter.dirs.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])
-AC_CONFIG_FILES([libmilter-dev.dirs])
 AC_CONFIG_FILES([libmilter-dev.links])
 AC_CONFIG_FILES([libmilter-dev.preinst])
 AC_CONFIG_FILES([rmail.dirs])
diff --git a/debian/libmilter-dev.dirs.in b/debian/libmilter-dev.dirs.in
deleted file mode 100644
index f2f0781..0000000
--- a/debian/libmilter-dev.dirs.in
+++ /dev/null
@@ -1 +0,0 @@
-.@libdir@/libmilter
diff --git a/debian/libmilter-dev.install b/debian/libmilter-dev.install
new file mode 100644
index 0000000..6b51cd5
--- /dev/null
+++ b/debian/libmilter-dev.install
@@ -0,0 +1,2 @@
+usr/include/libmilter/*.h
+usr/lib/libmilter/*.a
diff --git a/debian/rules b/debian/rules
index df2079e..bc772fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -356,6 +356,9 @@ common-install-arch::
 		${DEB_SRCDIR}/sendmail/sendmail.8
 	# sendmail install proper... with a little help ;-}
 	#$(MAKE) install DESTDIR="$(CURDIR)/${PKG_DIR}";
+	$(MAKE) -C ${DEB_SRCDIR}/libmilter	install		DESTDIR="$(DEB_DESTDIR)"
+	$(MAKE) -C ${DEB_SRCDIR}/libsm		install		DESTDIR="$(DEB_DESTDIR)"
+	$(MAKE) -C ${DEB_SRCDIR}/libsmutil	install		DESTDIR="$(DEB_DESTDIR)"
 	# Debian stuff
 	$(MAKE) -C debian/sensible_mda		install-arch	DESTDIR="$(DEB_DESTDIR)"
 	# Finally, install the whole enchilada
@@ -406,12 +409,6 @@ common-install-arch::
 		${PKG_DIR}${libexecdir}/vacation.sendmail; \
 	mv ${PKG_DIR}${mandir}/man1/vacation.1 \
 		${PKG_DIR}${mandir}/man1/vacation.sendmail.1; \
-	# libmilter-dev package
-		(cd ${DEB_SRCDIR}/obj*/libmilter && \
-			$(MAKE) install \
-			DESTDIR="../../../../debian/libmilter-dev";); \
-	$(MAKE) -C ${DEB_SRCDIR}/libsmutil	install DESTDIR="$(DEB_DESTDIR)/../libmilter-dev"
-	$(MAKE) -C ${DEB_SRCDIR}/libsm		install DESTDIR="$(DEB_DESTDIR)/../libmilter-dev"
 	#--------------------------------------------------------------------
 
 
-- 
cgit v1.2.3