X-Git-Url: https://git.tokkee.org/?p=pkg-ncmpc.git;a=blobdiff_plain;f=debian%2Frules;h=042e001a95056c29fe03b619e3bc9ac79d91178e;hp=9c42b7b3796394323e2d41f50223cf2c91a9ae00;hb=49dcbfecbc0494a64df0da8b1f023f5797e9d626;hpb=d97d106ae425528f19a8a2a042322618a0500fdb

diff --git a/debian/rules b/debian/rules
index 9c42b7b..042e001 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,13 +11,10 @@
 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
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
+CFLAGS += -Wall
+LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
 
 CHECK = check
 
@@ -25,9 +22,7 @@ ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	CHECK =
 endif
 
-include /usr/share/dpatch/dpatch.make
-
-config.status: configure $(DPATCH_STAMPFN)
+config.status: configure
 	dh_testdir
 	./configure --host=$(DEB_HOST_GNU_TYPE) \
 			--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
@@ -48,10 +43,15 @@ config.status: configure $(DPATCH_STAMPFN)
 			--enable-key-screen \
 			--enable-lyrics-screen \
 			--enable-outputs-screen \
+			--enable-documentation \
 			--with-ncursesw \
-			CFLAGS="$(CFLAGS)"
+			CPPFLAGS="$(CPPFLAGS)" \
+			CFLAGS="$(CFLAGS)" \
+			LDFLAGS="$(LDFLAGS)"
 
-build: build-stamp
+build: build-arch build-indep
+build-indep:
+build-arch: build-stamp
 
 build-stamp: config.status
 	dh_testdir
@@ -61,7 +61,7 @@ build-stamp: config.status
 	
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp