try restructuring rules to ensure reconf always run

[debian/gzip] / debian / rules

diff --git a/debian/rules b/debian/rules
index dc8534a0ec545291a6c5a1493690e1e928edd0dc..355dc0756a3f1f3effa703e3216c58547c73823f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -18,8 +18,13 @@ else
 CFLAGS=-g -O2 -Wall
 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
+
 configure: configure-stamp
-configure-stamp:
+configure-stamp: reconf-stamp
        dh_testdir
        mkdir -p build
        cd build && ../configure \
@@ -29,7 +34,7 @@ configure-stamp:
        touch configure-stamp
 
 configure-win32: configure-win32-stamp
-configure-win32-stamp:
+configure-win32-stamp: reconf-stamp
        dh_testdir
        mkdir -p build-win32
        cd build-win32 && ../configure --host=i586-mingw32msvc
@@ -50,7 +55,7 @@ build-win32-stamp: configure-win32-stamp
 clean:
        dh_testdir
        dh_testroot
-       -rm -f build-stamp build-win32-stamp configure-stamp configure-win32-stamp
+       -rm -f build-stamp build-win32-stamp configure-stamp configure-win32-stamp reconf-stamp
        -rm -rf build build-win32
        dh_clean
 
@@ -59,17 +64,13 @@ install: build
        dh_testroot
        dh_clean -k
        dh_installdirs
-
        $(MAKE) -C build install prefix=`pwd`/debian/gzip/usr bindir=`pwd`/debian/gzip/bin 
-       install -o root -g root -m 0644 debian/gzip.lintian \
-               debian/gzip/usr/share/lintian/overrides/gzip
 
 install-win32: build-win32
        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/
 
@@ -78,6 +79,7 @@ binary-indep: build-win32 install-win32
        dh_testroot -i
        dh_installdocs -i README* TODO
        dh_installchangelogs -i ChangeLog
+       dh_lintian -i
        dh_compress -i
        dh_fixperms -i
        dh_installdeb -i
@@ -89,10 +91,11 @@ binary-arch:        build install
        dh_testdir -s
        dh_testroot -s
        dh_installdocs -s README* TODO
-       dh_installmanpages -s
+       dh_installman *.1
        dh_installinfo -s doc/gzip.info
        dh_installchangelogs -s ChangeLog
        dh_link -s
+       dh_lintian -s
        dh_strip -s
        dh_compress -s
        ln -s gunzip.1.gz debian/gzip/usr/share/man/man1/uncompress.1.gz