summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rwxr-xr-xbootstrap15
2 files changed, 21 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 809f6d320..aab021122 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-10-13 Paul Eggert <eggert@cs.ucla.edu>
+
+ Sync from Bison, as follows:
+
+ 2006-10-01 Paul Eggert <eggert@cs.ucla.edu>
+
+ Fix problems with translating English-language diagnostics.
+ * bootstrap: Fix bug introduced in recent bootstrap changes, with
+ respect to bison-runtime pot generation. The YY_ stuff
+ wasn't being captured.
+
2006-10-13 Jim Meyering <jim@meyering.net>
* src/chown-core.c (change_file_owner): Use fstatat, not stat,
diff --git a/bootstrap b/bootstrap
index a2d4faa0a..21f2e0eb5 100755
--- a/bootstrap
+++ b/bootstrap
@@ -460,13 +460,18 @@ sed '
' po/Makevars.template >po/Makevars
if test -d runtime-po; then
- # Likewise for runtime-po/Makevars, except also change a few other parameters.
+ # Similarly for runtime-po/Makevars, but not quite the same.
rm -f runtime-po/Makevars
sed '
- s/^\(DOMAIN\) *=.*/\1 = '"$package"'-runtime/
- s/^\(subdir\) *=.*/\1 = runtime-po/
- s/^\(XGETTEXT_OPTIONS\) *=.*/\1 = '"$XGETTEXT_OPTIONS_RUNTIME"'/
- ' <po/Makevars >runtime-po/Makevars
+ /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/
+ /^subdir *=.*/s/=.*/= runtime-po/
+ /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
+ /^XGETTEXT_OPTIONS *=/{
+ s/$/ \\/
+ a\
+ '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
+ }
+ ' <po/Makevars.template >runtime-po/Makevars
# Copy identical files from po to runtime-po.
(cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)