* bootstrap: Run the bootstrap rules from a file named Makefile,

copied from Makefile.am for fresh checkouts.

diff --git a/ChangeLog b/ChangeLog
index ddf0769deb82606bd2136f261ac7c4ef7ce43e53..1abedaa1052e146fef869e558d90024cb0ac79f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-05  Gary V. Vaughan  <gary@gnu.org>
+
+       * bootstrap: Run the bootstrap rules from a file named Makefile,
+       copied from Makefile.am for fresh checkouts.
+
 2004-08-05  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * m4/libtool.m4 (_LT_PROG_LTMAIN): Require ltmain.sh using

diff --git a/bootstrap b/bootstrap
index 545cdbbb498dc2f6789a683f903b982a631e1e6c..1bb9e4fdbde219476c640f86aada4a720545040b 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -54,8 +54,10 @@ set -- `sed '/AC_INIT/{s/[][,()]/ /g; p;};d' configure.ac`
 # Building distributed files from configure is bad for automake, so we
 # generate them here, and have Makefile rules to keep them up to date:
 rm -f ./config/ltmain.sh ./m4/ltversion.m4
+test -f Makefile || { makefile=Makefile; cp Makefile.am $makefile; }
 make -f Makefile.am ./config/ltmain.sh ./m4/ltversion.m4 \
     top_srcdir=. PACKAGE="$2" VERSION="$3"
+test -z "$makefile" || rm -f "$makefile"
 
 # Make a dummy libtoolize script for autoreconf:
 cat > ./config/libtoolize <<'EOF'

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 881b20a54d3861fe97f2403b5b93a60504380b4e..7ac957a9c8dd00e4aa9eb3cf1b0702fefa61a1ae 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1545,8 +1545,8 @@ else
          striplib="$STRIP -x"
          AC_MSG_RESULT([yes])
        else
-  AC_MSG_RESULT([no])
-fi
+         AC_MSG_RESULT([no])
+       fi
        ;;
    *)
   AC_MSG_RESULT([no])