* bootstrap: Remove workaround for problem I encountered with

gettext 0.14.1; it seems to be fixed now.

diff --git a/ChangeLog b/ChangeLog
index e5ebc57f4d1dc033dca64bcbe78ec99c5cd43546..3da8437faa87d785da825055288f939c4f785323 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * bootstrap: Remove workaround for problem I encountered with
+       gettext 0.14.1; it seems to be fixed now.
+
 2005-05-22  Paul Eggert  <eggert@cs.ucla.edu>
 
        * NEWS: Version 2.0a.

diff --git a/bootstrap b/bootstrap
index d843e43cb0ed320f579336a3213e0ceb9bbfb466..a16b57e48f35bd0d34fb5e75b1e15b09d6854a61 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -226,17 +226,6 @@ intl_files_to_remove='
 echo $0: rm -fr $intl_files_to_remove ...
 rm -fr $intl_files_to_remove || exit
 
-# Patch what appears to be a bug in gettext 0.14.1;
-# remove this once the bug is fixed.
-grep @top_builddir@ po/Makefile.in.in >/dev/null || {
-  echo "$0: prepending 'top_builddir=@top_builddir@' to po/Makefile.in.in ... "
-  old_contents=`cat po/Makefile.in.in` || exit
-  cat >po/Makefile.in.in <<EOF
-top_builddir=@top_builddir@
-$old_contents
-EOF
-}
-
 # Put bug-reporting address into po/Makevars.
 echo "$0: sed '/^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-bison@gnu.org/' po/Makevars.template >po/Makevars ..."
 sed '/^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-bison@gnu.org/' po/Makevars.template >po/Makevars