From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Wed, 7 Dec 2005 20:46:54 +0000 (+0000)
Subject: * bootstrap: always remove Makefile, to avoid triggering the
X-Git-Tag: release-2-1b~369
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd53187a8c2e23ae49f09b5c7811b0b522dcd61f;p=thirdparty%2Flibtool.git

* bootstrap: always remove Makefile, to avoid triggering the
autotools rebuild rules before autoreconf builds these.
Reported by Bob Friesenhahn <bfriesen@simple.dallas.tx.us>.
---

diff --git a/ChangeLog b/ChangeLog
index 6a4b5e923..ee086969f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-07  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+	* bootstrap: always remove Makefile, to avoid triggering the
+	autotools rebuild rules before autoreconf builds these.
+	Reported by Bob Friesenhahn <bfriesen@simple.dallas.tx.us>.
+
 2005-12-07  Peter O'Gorman  <peter@pogma.com>
 
 	* libltdl/config/ltmain.m4sh, libltdl/m4/libtool.m4 [darwin]:
diff --git a/bootstrap b/bootstrap
index 05ee7bee6..f16f71bb7 100755
--- a/bootstrap
+++ b/bootstrap
@@ -104,8 +104,8 @@ shift
 
 # Whip up a dirty Makefile:
 makes='Makefile.am libltdl/Makefile.inc'
-test -f Makefile ||
-    $SED '/^if /,/^endif$/d;/^else$/,/^endif$/d;/^include /d' $makes > Makefile
+rm -f Makefile
+$SED '/^if /,/^endif$/d;/^else$/,/^endif$/d;/^include /d' $makes > Makefile
 
 # Building distributed files from configure is bad for automake, so we
 # generate them here, and have Makefile rules to keep them up to date.