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

diff --git a/debian/rules b/debian/rules
index 8369833..eb3b6c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,49 +11,59 @@ 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
 endif
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
+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 \
 		--prefix=/usr --bindir=/bin \
 		--infodir=`pwd`/debian/gzip/usr/share/info \
 		--mandir=`pwd`/debian/gzip/usr/share/man $(CONFARGS)
-	touch configure-stamp
+	touch $@
 
-configure-win32: configure-win32-stamp
-configure-win32-stamp:
+configure-indep: configure-indep-stamp
+configure-indep-stamp: reconf-stamp
 	dh_testdir
-	mkdir -p build-win32
-	cd build-win32 && ../configure --host=i586-mingw32msvc
-	touch configure-win32-stamp
+	mkdir -p build-indep
+	cd build-indep && ../configure --host=i686-w64-mingw32
+	touch $@
+
+build: build-arch build-indep
 
-build: build-stamp 
+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-win32: build-win32-stamp
-build-win32-stamp: configure-win32-stamp
+build-indep: build-indep-stamp
+build-indep-stamp: configure-indep-stamp
 	dh_testdir
-	$(MAKE) -C build-win32
-	touch build-win32-stamp
+	$(MAKE) -C build-indep
+	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
-	-rm -f build-stamp build-win32-stamp configure-stamp configure-win32-stamp
-	-rm -rf build build-win32
+	-rm -f build-stamp build-indep-stamp configure-stamp configure-indep-stamp reconf-stamp
+	-rm -rf build build-indep
 	dh_clean
 
 install: build
@@ -63,15 +73,15 @@ install: build
 	dh_installdirs
 	$(MAKE) -C build install prefix=`pwd`/debian/gzip/usr bindir=`pwd`/debian/gzip/bin 
 
-install-win32: build-win32
+install-indep: build-indep
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	i586-mingw32msvc-strip build-win32/gzip.exe
-	install -m 0755 build-win32/gzip.exe debian/gzip-win32/usr/share/win32/
+	i686-w64-mingw32-strip build-indep/gzip.exe
+	install -m 0755 build-indep/gzip.exe debian/gzip-win32/usr/share/win32/
 
-binary-indep:	build-win32 install-win32
+binary-indep:	build-indep install-indep
 	dh_testdir -i
 	dh_testroot -i
 	dh_installdocs -i README* TODO
@@ -109,5 +119,5 @@ binary-arch:	build install
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure
-.PHONY: build-win32 install-win32 configure-win32
+.PHONY: build-indep install-indep configure-indep