X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=debian%2Frules;h=83be2e58fa31bb77c72140a1f4b5e641883b90be;hb=2c0385c5372f29113468093d1511d4dc1725fcbd;hp=a8c932ce12db443dbae0b5f4bb191e8fd4a9abe8;hpb=8e974c4c1ec984772720c773220e365d97006974;p=debian%2Fgzip

diff --git a/debian/rules b/debian/rules
index a8c932c..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
 
@@ -46,13 +49,18 @@ build-arch: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
 	$(MAKE) -C build
-	touch build-stamp
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	$(MAKE) -C build check
+endif
+endif
+	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