From 5dea5d07cdad67d8ca1ce90eef9dc7847c057c02 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 13 Oct 2006 19:07:21 +0000 Subject: [PATCH] Sync from Bison, as follows: 2006-10-01 Paul Eggert 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. --- ChangeLog | 11 +++++++++++ bootstrap | 15 ++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 809f6d3..aab0211 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2006-10-13 Paul Eggert + + Sync from Bison, as follows: + + 2006-10-01 Paul Eggert + + 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 * src/chown-core.c (change_file_owner): Use fstatat, not stat, diff --git a/bootstrap b/bootstrap index a2d4faa..21f2e0e 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"'/ - ' 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+} + } + ' runtime-po/Makevars # Copy identical files from po to runtime-po. (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po) -- 2.7.4