From: Gary V. Vaughan <gary@gnu.org>
Date: Thu, 5 Aug 2004 15:32:58 +0000 (+0000)
Subject: * bootstrap: Run the bootstrap rules from a file named Makefile,
X-Git-Tag: release-1-9b~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=406ec70ff98069fc2b4421ec38126a2c0e3ba22c;p=thirdparty%2Flibtool.git

* bootstrap: Run the bootstrap rules from a file named Makefile,
copied from Makefile.am for fresh checkouts.
---

diff --git a/ChangeLog b/ChangeLog
index ddf0769de..1abedaa10 100644
--- 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 545cdbbb4..1bb9e4fdb 100755
--- 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 881b20a54..7ac957a9c 100644
--- 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])