Merge remote-tracking branch 'upstream/debian/sid' into feature/upgrade-with-new

[apt.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 4686f569de06b659a7adb5a4ca8673e0f5929f85..06ccdac31c245478923b43bdd0ed55cb9b99cd0b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -77,7 +77,7 @@ build/environment.mak: build/configure-stamp
        @true
 
 configure: configure.ac
-build/configure-stamp: configure
+build/configure-stamp: configure buildlib/config.sub buildlib/config.guess
        dh_testdir
        -mkdir build
        cp COPYING debian/copyright
@@ -115,7 +115,9 @@ clean:
        [ ! -f Makefile ] || $(MAKE) clean distclean
        rm -rf build
        rm -f debian/$(LIBAPT_PKG).install debian/$(LIBAPT_INST).install \
-             debian/libapt-pkg-dev.install
+             debian/libapt-pkg-dev.install debian/apt.install
+       test ! -L buildlib/config.guess || rm -f buildlib/config.guess
+       test ! -L buildlib/config.sub || rm -f buildlib/config.sub
 
 debian/%.install: debian/%.install.in
        sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@
@@ -172,7 +174,7 @@ apt-doc: build-debiandoc
 # Build architecture-dependent files here.
 
 apt_MANPAGES = apt apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list
-apt: build-binary build-manpages
+apt: build-binary build-manpages debian/apt.install
        dh_testdir -p$@
        dh_testroot -p$@
        dh_prep -p$@
@@ -328,6 +330,9 @@ apt-transport-https: build-binary libapt-pkg-dev
        dh_md5sums -p$@
        dh_builddeb -p$@
 
+buildlib/config.guess buildlib/config.sub:
+       $(MAKE) "$@"
+
 configure:
        $(MAKE) configure