* 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 6a4b5e92365eba46d647c05189ac5c8440150e69..ee086969fd26c26ea0a64bfe9d8e3a90fb81307a 100644 (file)
--- 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 05ee7bee6e9b0f06d030d9232d6e72cb0c6cc1be..f16f71bb7d8abd5129ba70ef65cdca339cfe34b6 100755 (executable)
--- 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.