X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/8e521837dc2065ec8960cefff6c1cbb5c33498dc..b85481146a172533e0ceb2c4d759cfb8b8aa60b3:/bootstrap

diff --git a/bootstrap b/bootstrap
index 48b2b36b..63ba1749 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2,13 +2,21 @@
 
 echo "Bootstrapping CVS Bison..."
 
-autoreconf --force --install --verbose
+# This will run gettextize which will patch some files, and cause
+# autoconf to choke (because for instance intl/Makefile is registered
+# several times).
+autoreconf --verbose --install --force
 
-# Because of Gettext
-mv -f m4/Makefile.am~ m4/Makefile.am
-mv -f Makefile.am~ Makefile.am
-mv -f configure.in~ configure.in
-touch m4/Makefile.am Makefile.am configure.in
+# gettextize modified these files: restore them.
+for f in m4/Makefile.am Makefile.am configure.in
+do
+  if test -f "$f~"; then
+    mv -f "$f~" "$f"
+  fi
+done
 rm -f po/Makevars.template
 
-autoreconf --verbose
+# Since some files were restored, some files must probably be remade.
+# But automake could not install all of its files, so pass --install
+# for it.
+autoreconf --verbose --install