From: Adam Heath <doogie@debian.org>
Date: Tue, 2 Jul 2002 06:06:00 +0000 (+0000)
Subject: Don't always call autoheader during build.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=508fbc5a5cfcdb77d685370d3df99cc9616fdec1;p=dpkg

Don't always call autoheader during build.
---

diff --git a/ChangeLog b/ChangeLog
index 0712e07a..37effb3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul  2 01:04:29 CDT 2002 Adam Heath <doogie@debian.org>
+
+  * debian/rules: Don't always call autoheader during build.
+
 Mon Jul  1 14:45:11 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
 
   * debian/control: add conflict with dpkg-iasearch which intruded on
diff --git a/debian/changelog b/debian/changelog
index b2bbdcbf..7c95d1fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ dpkg (1.10.1) unstable; urgency=low
 
   * Add conflict with dpkg-iasearch which intruded on our namespace
   * Replace manpages-de which includes one of our manpages
+  * Don't always call autoheader when building.  Closes: #151471.
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 
diff --git a/debian/rules b/debian/rules
index 6950a36e..809fe225 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,16 +28,18 @@ BUILD-DIRS	:= $(BUILD) $(BUILD)-static
 aclocal.m4: $(wildcard automake/*.m4)
 	aclocal -I automake
 
+# The following 2 rules should only be run, if their dependants have
+# been modified.  For clean builds, this won't happen.  Only if the
+# builder has modified these files after extraction.
+
 configure: configure.in aclocal.m4
 	autoconf
 
-$(BUILD)/stamp.config.h.in: configure.in
-	install -d $(@D)
+config.h.in: configure.in
 	autoheader
-	touch $@
 
 # Setup the buildlocation
-$(BUILD)/configure-stamp: configure $(BUILD)/stamp.config.h.in
+$(BUILD)/configure-stamp: configure config.h.in
 	$(checkdir)
 	install -d $(@D)
 	cd $(@D) && LDFLAGS=$(LDFLAGS) $(CURDIR)/configure \
@@ -95,20 +97,18 @@ binary-dpkg-most binary-dpkg-static-most: binary-dpkg%-most: stamp-binary%
 	install -d -m 755 -o root -g root $(TMP_DPKG)/usr/lib/dpkg
 	install -d -m 755 -o root -g root $(TMP_DPKG)/usr/bin
 	install -d -m 755 -o root -g root $(TMP_DPKG)/sbin
-	install -d -m 755 -o root -g root $(TMP_DPKG)/var/lib/dpkg
 	-test -d $(INSTALL_TMP)/etc && cp -a $(INSTALL_TMP)/etc $(TMP_DPKG)/
-	set -e ; for i in info alternatives parts updates ; do \
-		mv $(INSTALL_TMP)/var/lib/dpkg/$$i $(TMP_DPKG)/var/lib/dpkg/ ; \
-	done
+	cp -a $(INSTALL_TMP)/var $(TMP_DPKG)/
 	cp -a $(INSTALL_TMP)/usr/sbin/start-stop-daemon $(TMP_DPKG)/sbin/
 	cp -a $(INSTALL_TMP)/usr/sbin $(TMP_DPKG)/usr/
 	cp -a $(INSTALL_TMP)/usr/lib/dpkg/mksplit $(TMP_DPKG)/usr/lib/dpkg/
 	cp -a $(INSTALL_TMP)/usr/lib/dpkg/enoent $(TMP_DPKG)/usr/lib/dpkg/
+	cp -a $(INSTALL_TMP)/usr/lib/dpkg/methods $(TMP_DPKG)/usr/lib/dpkg/
 	cp -a $(INSTALL_TMP)/usr/share/locale $(TMP_DPKG)/usr/share/
 	set -e ; for i in dpkg-split dpkg-query ; do \
 		cp -a $(INSTALL_TMP)/usr/bin/$$i $(TMP_DPKG)/usr/bin/ ; \
 	done
-	set -e ; for i in dpkg dpkg-deb md5sum ; do \
+	set -ex ; for i in dpkg dpkg-deb md5sum ; do \
 		cp -a $(INSTALL_TMP)/usr/bin/$$i$(static) $(TMP_DPKG)/usr/bin/$$i ; \
 	done
 	set -e ; for i in ChangeLog THANKS TODO copyright ; do \
@@ -231,12 +231,6 @@ binary-dselect: stamp-binary
 	install -d -m 755 -o root -g root $(TMP_DSELECT)/usr/bin
 	mv $(INSTALL_TMP)/usr/bin/dselect $(TMP_DSELECT)/usr/bin/
 
-	install -d -m 755 -o root -g root $(TMP_DSELECT)/usr/lib
-	mv $(INSTALL_TMP)/usr/lib/dpkg/methods $(TMP_DSELECT)/usr/lib/dpkg/
-
-	install -d -m 755 -o root -g root $(TMP_DSELECT)/var/lib/dpkg
-	mv $(INSTALL_TMP)/var/lib/dpkg/methods $(TMP_DSELECT)/var/lib/dpkg/
-
 	set -e ; for i in "" de fr ja sv ; do \
 		install -d -m 755 -o root -g root $(TMP_DSELECT)/usr/share/man/$$i/man8 ; \
 		for m in dselect.8 ; do \