X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=debian%2Frules;h=63702e50a81fbc5d92cc7b959acaced880dccfdb;hb=32fadf783eca510dd81c4e8173f383de5b63899b;hp=8c82591e4c6dea729e7dba8aff0b8db7311d83c3;hpb=c971cd8b36b7f6aa7f3fef5fec14e7fddc9b9475;p=pkg-libmpdclient.git

diff --git a/debian/rules b/debian/rules
index 8c82591..63702e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,10 +8,11 @@
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+include /usr/share/dpkg/architecture.mk
 
-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,13 +28,15 @@ 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)"
+			--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+			CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)"
 
 build: build-arch build-indep
 
@@ -55,6 +58,7 @@ clean:
 	
 	[ ! -f Makefile ] || $(MAKE) distclean
 	
+	dh_autotools-dev_restoreconfig
 	dh_clean
 
 install: build
@@ -66,7 +70,7 @@ install: build
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	
 	# we do not want .la files in Debian
-	rm -f debian/tmp/usr/lib/libmpdclient.la
+	rm -f debian/tmp/usr/lib/*/libmpdclient.la
 	
 	# these files do not include any useful content
 	rm -f debian/tmp/usr/share/doc/libmpdclient/README
@@ -76,6 +80,7 @@ install: build
 	rm -f debian/tmp/usr/share/doc/libmpdclient/NEWS
 	
 	dh_install --sourcedir=debian/tmp --fail-missing
+	dh_lintian
 
 binary-indep: build install
 	dh_testdir