[Buildd-tools-devel] [PATCH] [debian] Improve config.{guess, sub} scripts handling.

[Cyril Brulebois]

Copy them at build-time (and B-D on autotools-dev accordingly), and
remove them on clean, keeping the Debian diff clean.
---
 debian/control |    2 +-
 debian/rules   |   11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 07230ae..a84d0e6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: extra
 Maintainer: Debian buildd-tools Developers <buildd-tools-devel at lists.alioth.debian.org>
 Uploaders: Michael Banck <mbanck at debian.org>, Roger Leigh <rleigh at debian.org>, Francesco Paolo Lovergine <frankie at debian.org>
-Build-Depends: debhelper (>> 6.0.0)
+Build-Depends: debhelper (>> 6.0.0), autotools-dev
 Standards-Version: 3.8.0
 Vcs-Browser: http://git.debian.org/?p=buildd-tools/sbuild.git
 Vcs-Git: git://git.debian.org/git/buildd-tools/sbuild
diff --git a/debian/rules b/debian/rules
index c23ef0d..9937360 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,9 @@ DESTDIR=$(CURDIR)/debian/sbuild
 debian/build/config.status: configure
 	dh_testdir
 
+	cp /usr/share/misc/config.guess scripts/config.guess
+	cp /usr/share/misc/config.sub scripts/config.sub
+
 	mkdir debian/build; \
 	cd debian/build; \
 	CFLAGS="$(CFLAGS)" ../../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/share --localstatedir=/var --mandir=\$${prefix}/share/man
@@ -36,13 +39,7 @@ clean:
 	rm -rf debian/build
 	rm -rf debian/install
 	rm -f debian/build-stamp
-
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub scripts/config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess scripts/config.guess
-endif
+	rm -f scripts/config.guess scripts/config.sub
 
 	dh_clean
 
-- 
1.5.6.3