Gettext 0.11.3 adjustments.

diff --git a/README-cvs b/README-cvs
index a3bb7351a7214ecdbc5abc69cdb35c30073900ed..a8da26f833d4963773f6c7f04042ea5c35a0bb77 100644 (file)
--- a/README-cvs
+++ b/README-cvs
@@ -7,7 +7,7 @@ maintainer tools we depend upon:
 - Autoconf 2.53a or better
   ftp://alpha.gnu.org/gnu/autoconf/autoconf-2.53a.tar.gz   (992 kB)
   ftp://alpha.gnu.org/gnu/autoconf/autoconf-2.53a.tar.bz2  (756 kB)
 - Autoconf 2.53a or better
   ftp://alpha.gnu.org/gnu/autoconf/autoconf-2.53a.tar.gz   (992 kB)
   ftp://alpha.gnu.org/gnu/autoconf/autoconf-2.53a.tar.bz2  (756 kB)

-- Gettext 0.10.1
+- Gettext 0.11.3

 
 Only building the initial full source tree will be a bit painful,
 later, a plain `cvs update -P & make' should be sufficient.
 
 Only building the initial full source tree will be a bit painful,
 later, a plain `cvs update -P & make' should be sufficient.

diff --git a/bootstrap b/bootstrap
index 63ba1749972bac173b8a9152141c7bcc104ad5bf..c27557b5d8ba8acc8c13e1a3363d221640227c4d 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -2,21 +2,5 @@
 
 echo "Bootstrapping CVS Bison..."
 
 
 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
 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"
-  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