(S/R in initial, Defaulted Conflicted Reduction):

[bison.git] / bootstrap

diff --git a/bootstrap b/bootstrap
index 11479329a9b75b3a63feea03bd549608b5807e79..c27557b5d8ba8acc8c13e1a3363d221640227c4d 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -2,22 +2,5 @@
 
 echo "Bootstrapping CVS Bison..."
 
-# This will run gettextize which will patch some files, and cause
-# autoconf to choke (because for instance intl/Makefile is registered
-# several times).
+echo "running: autoreconf --verbose --install --force"
 autoreconf --verbose --install --force
-
-# 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"
-    touch "$f"
-  fi
-done
-rm -f po/Makevars.template
-
-# 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