X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Frules;h=3075b45df41abb6757b7912307f7ebc3070e8309;hb=9428ec1fc5bb0556c3462ef44930266205627996;hp=2418ad8848fd9d1955914cc4badf59ab63ec8055;hpb=4638ed5bc74353985ec476feee1884d501296e10;p=pkg-libmpdclient.git

diff --git a/debian/rules b/debian/rules
index 2418ad8..3075b45 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,9 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS = -Wall -g
+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
+CFLAGS += -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -27,15 +29,19 @@ endif
 
 config.status: configure
 	dh_testdir
+	dh_autotools-dev_updateconfig
 	
 	./configure \
 			--host=$(DEB_HOST_GNU_TYPE) \
 			--build=$(DEB_BUILD_GNU_TYPE) \
 			--prefix=/usr \
 			--mandir=\$${prefix}/share/man \
-			CFLAGS="$(CFLAGS)"
+			CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)"
 
-build: build-stamp
+build: build-arch build-indep
+
+build-arch: build-stamp
+build-indep: build-stamp
 
 build-stamp: config.status
 	dh_testdir
@@ -52,6 +58,7 @@ clean:
 	
 	[ ! -f Makefile ] || $(MAKE) distclean
 	
+	dh_autotools-dev_restoreconfig
 	dh_clean
 
 install: build