[Pkg-cyrus-sasl2-commits] r70 - /cyrus-sasl-2.1/trunk/debian/rules

[el_cubano-guest at users.alioth.debian.org]

Author: el_cubano-guest
Date: Thu Oct 19 01:54:50 2006
New Revision: 70

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=70
Log:
Revert Andreas' debian/rules cleanup

Modified:
    cyrus-sasl-2.1/trunk/debian/rules

Modified: cyrus-sasl-2.1/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/rules?rev=70&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/rules (original)
+++ cyrus-sasl-2.1/trunk/debian/rules Thu Oct 19 01:54:50 2006
@@ -69,12 +69,16 @@
 	dh_testroot
 	rm -f build-stamp 
 
+ifneq "$(wildcard config.sub.old)" ""
+	mv config.sub.old config/config.sub
+endif
+ifneq "$(wildcard config.guess.old)" ""
+	mv config.guess.old config/config.guess
+endif
 	-$(MAKE) distclean
-	-rm -f config.h config.log autom4ate.cache \
-		config/config.guess config/config.sub \
-		saslauthd/config/config.guess saslauthd/config/config.sub
-
-	dh_clean
+	-rm -f config.h config.log autom4ate.cache
+
+	dh_clean 
 
 ###
 # Configure the package.
@@ -83,6 +87,17 @@
 config.status: patch configure
 	dh_testdir
 
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	mv -f config/config.sub config.sub.old
+	cp -f /usr/share/misc/config.sub config/config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	mv -f config/config.guess config.guess.old
+	cp -f /usr/share/misc/config.guess config/config.guess
+endif
+
+	# Avoid problems with timestamp skew and autotools.
+	touch configure
 	$(AUTOTOOLS)
 	(cd saslauthd && $(AUTOTOOLS) && cd ..)
 	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure \