From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 28 Jul 2010 09:02:50 +0000 (+0200)
Subject: Bootstrap: fixlet.
X-Git-Tag: v1.11.1b~58^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d628025fd4ad5ce662a24a818ae97f1af7c0a7d3;p=thirdparty%2Fautomake.git

Bootstrap: fixlet.

* bootstrap: Do not remove `lib/Automake/Config.pm' anymore,
since we don't generate it.  Correctly quote arguments of
`eval' builtin.  Fixed a botched error message.  Removed an
extra blank line.
---

diff --git a/ChangeLog b/ChangeLog
index 815f467da..c3c348f0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-08-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
+	Bootstrap: fixlet.
+	* bootstrap: Do not remove `lib/Automake/Config.pm' anymore,
+	since we don't generate it.  Correctly quote arguments of
+	`eval' builtin.  Fixed a botched error message.  Removed an
+	extra blank line.
+
 	Bootstrap: don't search perl in $PATH.
 	* bootstrap: Do not explicitly search perl in $PATH anymore.
 	($PATH_SEPARATOR): Removed, it's no more needed.
diff --git a/bootstrap b/bootstrap
index f72346f79..9f1a8d824 100755
--- a/bootstrap
+++ b/bootstrap
@@ -49,7 +49,7 @@ fi
 
 # Read the rule for calculating APIVERSION and execute it.
 apiver_cmd=`sed -ne 's/\[\[/[/g;s/\]\]/]/g;/^APIVERSION=/p' configure.ac`
-eval $apiver_cmd
+eval "$apiver_cmd"
 
 # Sanity checks.
 if test -z "$VERSION"; then
@@ -58,7 +58,7 @@ if test -z "$VERSION"; then
 fi
 
 if test -z "$APIVERSION"; then
-  echo "$me: cannot find VERSION" >&2
+  echo "$me: cannot find APIVERSION" >&2
   exit 1
 fi
 
@@ -90,7 +90,6 @@ dosubst ()
   chmod a-w $2
 }
 
-
 # Create temporary replacement for lib/Automake/Config.pm.
 dosubst automake-$APIVERSION/Automake/Config.in \
         automake-$APIVERSION/Automake/Config.pm
@@ -117,4 +116,3 @@ $PERL ./automake.tmp
 # Remove temporary files and directories.
 rm -rf aclocal-$APIVERSION automake-$APIVERSION
 rm -f aclocal.tmp automake.tmp
-rm -f lib/Automake/Config.pm