X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=debian%2Frules;h=83be2e58fa31bb77c72140a1f4b5e641883b90be;hb=2b903e1eb92d02da022f645df7fa18657efc0ec0;hp=18290b24c243ad29aff98ee4b59afc24a58295ed;hpb=f11a18c79b606ff4c6438205bce8175a0f91c427;p=debian%2Fgzip

diff --git a/debian/rules b/debian/rules
index 18290b2..83be2e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,34 +11,37 @@ ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 CONFARGS = --host=$(DEB_HOST_GNU_TYPE)
 endif
 
-buildarch := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-ifeq ($(buildarch),amd64)
-CFLAGS=-g -O2 -Wall -DUNALIGNED_OK
-else
-CFLAGS=-g -O2 -Wall
+CFLAGS = `dpkg-buildflags --get CFLAGS`
+CFLAGS += -Wall
+LDFLAGS = `dpkg-buildflags --get LDFLAGS`
+CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
+
+ifeq ($(shell dpkg-architecture -qDEB_HOST_ARCH),amd64)
+CFLAGS += -DUNALIGNED_OK
 endif
 
 reconf-stamp:
 	cp -f /usr/share/misc/config.sub build-aux/config.sub
 	cp -f /usr/share/misc/config.guess build-aux/config.guess
 	autoreconf -v
+	touch $@
 
 configure: configure-stamp
 configure-stamp: reconf-stamp
 	dh_testdir
 	mkdir -p build
-	cd build && ../configure \
+	cd build && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" ../configure \
 		--prefix=/usr --bindir=/bin \
 		--infodir=`pwd`/debian/gzip/usr/share/info \
 		--mandir=`pwd`/debian/gzip/usr/share/man $(CONFARGS)
-	touch configure-stamp
+	touch $@
 
 configure-indep: configure-indep-stamp
 configure-indep-stamp: reconf-stamp
 	dh_testdir
 	mkdir -p build-indep
 	cd build-indep && ../configure --host=i686-w64-mingw32
-	touch configure-indep-stamp
+	touch $@
 
 build: build-arch build-indep
 
@@ -48,16 +51,16 @@ build-stamp: configure-stamp
 	$(MAKE) -C build
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-	$(MAKE) check
+	$(MAKE) -C build check
 endif
 endif
-	touch build-stamp
+	touch $@
 
 build-indep: build-indep-stamp
 build-indep-stamp: configure-indep-stamp
 	dh_testdir
 	$(MAKE) -C build-indep
-	touch build-indep-stamp
+	touch $@
 
 clean:
 	dh_testdir