[Pkg-giraffe-discuss] [PATCH 3/3] debian/rules: adjust the targets after dh version change

[c.schoenert at t-online.de]

From: Carsten Schoenert <c.schoenert at t-online.de>

---
 debian/rules | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 73aeaf3..383909c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,12 +13,13 @@ else
     CFLAGS += -O2
 endif
 
+PACKAGE_BASE = "libvmime"
 CONFFLAG = "--enable-debug"
 
-CFLAGS = "-Wall -g -Wl,-z,defs"
+CFLAGS += -Wall -g -Wl,-z,defs
 
 DEB_CONFIGURE_EXTRA_ARGS :=      \
-    CFLAGS=$(CFLAGS) \
+    CFLAGS="$(CFLAGS)" \
     --host=$(DEB_HOST_GNU_TYPE) \
     --build=$(DEB_BUILD_GNU_TYPE) \
     --prefix=/usr \
@@ -31,16 +32,22 @@ DEB_CONFIGURE_EXTRA_ARGS :=      \
 	dh $@ --parallel
 
 override_dh_auto_clean:
-	[ ! -f Makefile ] || $(MAKE) clean
 	rm -f Makefile src/Makefile vmime/Makefile vmime/config.hpp build-stamp libtool config.guess config.log config.sub config.status config.h vmime.pc stamp-h1
 	cd src ; rm -f `find . -type l`
 	dh_auto_clean
 
+override_dh_autoreconf:
+	touch autotools/config.rpath
+	dh_autoreconf
+
 override_dh_auto_configure:
-	[ -f ./bootstrap ] && ./bootstrap
 	dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_ARGS)
 
 override_dh_install:
+	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ \
+		debian/$(PACKAGE_BASE)-dev.install.in > debian/$(PACKAGE_BASE)-dev.install
+	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ \
+		debian/$(PACKAGE_BASE)0.install.in > debian/$(PACKAGE_BASE)0.install
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	dh_install
 
-- 
2.10.2