From d628025fd4ad5ce662a24a818ae97f1af7c0a7d3 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Wed, 28 Jul 2010 11:02:50 +0200 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ bootstrap | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 815f467da..c3c348f0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2010-08-08 Stefano Lattarini + 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 -- 2.47.2