diff --git a/ChangeLog b/ChangeLog index b1679b775..5de232556 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2007-02-20 Jim Meyering + * bootstrap: Move definitions of temporary directory names and the + new bt_regex "up" to precede all uses, so it's clearer what their + scope is. Also, use [.], rather than \\., since the former works + even if eval'd. + * bootstrap: Remove occurrences of $bt (._bootmp) from lib/Makefile. Based on the bison 2007-02-19 change by Joel E. Denny. diff --git a/bootstrap b/bootstrap index ccc8c860b..a7d1fa3dc 100755 --- a/bootstrap +++ b/bootstrap @@ -29,6 +29,11 @@ nl=' LC_ALL=C export LC_ALL +# Temporary directory names. +bt='._bootmp' +bt_regex=`echo "$bt"| sed 's/\./[.]/g'` +bt2=${bt}2 + usage() { echo >&2 "\ Usage: $0 [OPTION]... @@ -416,10 +421,6 @@ slurp() { # Create boot temporary directories to import from gnulib and gettext. - -bt='._bootmp' -bt_regex=`echo "$bt"| sed 's/\./\\./g'` -bt2=${bt}2 rm -fr $bt $bt2 && mkdir $bt $bt2 || exit