debian/rules: remove config.{sub,guess} in clean target and copy them

over in configure target as a preparation for source format "3.0 (quilt)";
thanks to Raphaël Hertzog for the bug report (closes: #482730).

diff --git a/debian/changelog b/debian/changelog
index 84ff66b35f75ac40125004d7d82d76879b08131e..b3652cf76851b1db06dc042d8f335a1770ee05c1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ mimetic (0.9.3-3) UNRELEASED; urgency=low
   * Create install-stamp target in debian/rules and adjust dependencies
     accordingly.
   * Change debian/copyright to the new machine-readable format.
+  * debian/rules: remove config.{sub,guess} in clean target and copy them
+    over in configure target as a preparation for source format "3.0 (quilt)";
+    thanks to Raphaël Hertzog for the bug report (closes: #482730).
 
  -- gregor herrmann <gregor+debian@comodo.priv.at>  Mon, 24 Dec 2007 23:22:07 +0100
 

diff --git a/debian/rules b/debian/rules
index 8cc483424585d01b1e4299574969ca08a8d6360b..3b472a986f52d93cef0021eb3c6ccdbf1c03e567 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -27,14 +27,21 @@ endif
 
 config.status: configure
        dh_testdir
+
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+       cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+       cp -f /usr/share/misc/config.guess config.guess
+endif
+
        CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
 
 build: build-stamp
-build-stamp: $(QUILT_STAMPFN) config.status
+build-stamp: config.status $(QUILT_STAMPFN)
        dh_testdir
        $(MAKE)
-       #cd $(CURDIR)/doc && $(MAKE) docs
        $(MAKE) -C $(CURDIR)/doc docs
        touch $@
 
@@ -42,16 +49,9 @@ clean: unpatch
        dh_testdir
        dh_testroot
 
+       rm -f config.sub config.guess
        [ ! -f Makefile ] || $(MAKE) distclean
        [ ! -f $(CURDIR)/doc/Makefile ] || $(MAKE) -C $(CURDIR)/doc dist-clean
-       #-cd $(CURDIR)/doc && $(MAKE) dist-clean
-       
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-       cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-       cp -f /usr/share/misc/config.guess config.guess
-endif
 
        dh_clean build-stamp install-stamp
 
@@ -59,7 +59,7 @@ install: install-stamp
 install-stamp: build-stamp
        dh_testdir
        dh_testroot
-       dh_clean -k 
+       dh_clean -k
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
        touch $@
@@ -88,4 +88,4 @@ binary-arch: build install
        dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install