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.
* bootstrap.conf (XGETTEXT_OPTIONS_RUNTIME): New var.
* po/POTFILES.in: Add src/location.c, src/scan-code.l.
* runtime-po/POTFILES.in: Add data/push.c.

ChangeLog

@@ -1,3 +1,13 @@
+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.
+	* bootstrap.conf (XGETTEXT_OPTIONS_RUNTIME): New var.
+	* po/POTFILES.in: Add src/location.c, src/scan-code.l.
+	* runtime-po/POTFILES.in: Add data/push.c.
+
 2006-09-29  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Merge bootstrap changes from coreutils.

bootstrap

@@ -443,13 +443,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)

bootstrap.conf

@@ -40,6 +40,9 @@ XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
  --flag=warn:1:c-format  --flag=warn_at:2:c-format\\\
  --flag=unexpected_end:2:c-format\\\
 '
+XGETTEXT_OPTIONS_RUNTIME=$XGETTEXT_OPTIONS'\\\
+ --keyword=YY_ \\\
+'
 
 # Gettext supplies these files, but we don't need them since
 # we don't have an intl subdirectory.

po/POTFILES.in

@@ -3,11 +3,13 @@ src/conflicts.c
 src/files.c
 src/getargs.c
 src/gram.c
+src/location.c
 src/main.c
 src/parse-gram.y
 src/print.c
 src/reader.c
 src/reduce.c
+src/scan-code.l
 src/scan-gram.l
 src/symlist.c
 src/symtab.c

runtime-po/POTFILES.in

@@ -1,3 +1,4 @@
 data/glr.c
 data/lalr1.cc
+data/push.c
 data/yacc.c