X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/fee2ed87aa5f0c2a1cefbe4056300e8a28794e39..07a6e87d46f32a8248c2160ddd2345333f1c84b4:/bootstrap

diff --git a/bootstrap b/bootstrap
index c3c7748b..0c136f62 100755
--- a/bootstrap
+++ b/bootstrap
@@ -144,9 +144,9 @@ vc_ignore=auto
 # -------------------------
 find_tool ()
 {
-  # Find sha1sum, named gsha1sum on MacPorts.
   find_tool_envvar=$1
   shift
+  find_tool_name=$@
   if eval test x"\$$find_tool_envvar" = x; then
     for i
     do
@@ -157,7 +157,7 @@ find_tool ()
     done
   fi
   if test x"$find_tool_res" = x; then
-    echo >&2 "$0: $find_tool_name is required"
+    echo >&2 "$0: one of these is required: $find_tool_names"
     exit 1
   fi
   ($find_tool_res --version </dev/null) >/dev/null 2>&1 || {
@@ -505,11 +505,10 @@ slurp() {
       if test $file = Makefile.am; then
 	copied=$copied${sep}$gnulib_mk; sep=$nl
 	remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g"
-	sed "$remove_intl" $1/$dir/$file | cmp -s - $dir/$gnulib_mk || {
-	  echo "$0: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
-	  rm -f $dir/$gnulib_mk &&
-	  sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk
-	}
+	echo "$0: Copying $1/$dir/$file to $dir/$gnulib_mk ..."
+	rm -f $dir/$gnulib_mk
+	sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk
+        etc/prefix-gnulib-mk $dir/$gnulib_mk
       elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
 	   version_controlled_file $dir $file; then
 	echo "$0: $dir/$file overrides $1/$dir/$file"
@@ -614,12 +613,6 @@ if test -f $mam_template; then
   done
 fi
 
-# FIXME: Gnulib should be patched to add "/" in front of .gitignore entries
-# instead.  Anyway, this hack must be done before invoking autoconf so that
-# build-aux/git-version-gen doesn't think the version is dirty because
-# .gitignore isn't committed.
-grep -v '^GNUmakefile$' .gitignore > .gitignore~ && mv .gitignore~ .gitignore
-
 # Reconfigure, getting other files.
 
 for command in \