X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=debian%2Frules;h=eb3b6c347babde32221b5d4dfaa91e8503d74918;hb=48b09c937e2291a84e91f0e1a62ca306c11bdb56;hp=a1fe3c5ded446cd08a8d66c227ccf33688478fd8;hpb=6701dbd4a272e4a185cc69b2412da7d1c568f845;p=debian%2Fgzip

diff --git a/debian/rules b/debian/rules
index a1fe3c5..eb3b6c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,7 @@ 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)
+ifeq ($(shell dpkg-architecture -qDEB_HOST_ARCH),amd64)
 CFLAGS=-g -O2 -Wall -DUNALIGNED_OK
 else
 CFLAGS=-g -O2 -Wall
@@ -22,6 +21,7 @@ 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
@@ -31,14 +31,14 @@ configure-stamp: reconf-stamp
 		--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 +46,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
@@ -74,7 +79,7 @@ install-indep: build-indep
 	dh_clean -k
 	dh_installdirs
 	i686-w64-mingw32-strip build-indep/gzip.exe
-	install -m 0755 build-indep/gzip.exe debian/gzip-indep/usr/share/indep/
+	install -m 0755 build-indep/gzip.exe debian/gzip-win32/usr/share/win32/
 
 binary-indep:	build-indep install-indep
 	dh_testdir -i