minor bootstrap spruceup for Bison

[Paul Eggert]

Bison no longer bootstrap from CVS for me, due to changes in gnulib.
Also, I noticed that runtime-po/Makevars wasn't configured as
concisely as it could be.  I installed this:

2006-11-08  Paul Eggert  <address@hidden>

        * bootstrap (runtime-po/Makevars): Derive from po/Makevars
        instead of from the template, to simplify configuration a bit.
        * bootstrap.conf (excluded_files): Don't exclude m4/codeset.m4
        and m4/wint_t.m4, as they are needed with the latest gnulib.

Index: bootstrap
===================================================================
RCS file: /cvsroot/bison/bison/bootstrap,v
retrieving revision 1.47
diff -p -u -r1.47 bootstrap
--- bootstrap   15 Oct 2006 04:31:23 -0000      1.47
+++ bootstrap   8 Nov 2006 19:59:50 -0000
@@ -475,18 +475,13 @@ sed '
 ' po/Makevars.template >po/Makevars
 
 if test -d runtime-po; then
-  # Similarly for runtime-po/Makevars, but not quite the same.
+  # Likewise for runtime-po/Makevars, except also change a few other 
parameters.
   rm -f runtime-po/Makevars
   sed '
-    /^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
+    s/^\(DOMAIN\) *=.*/\1 = '"$package"'-runtime/
+    s/^\(subdir\) *=.*/\1 = runtime-po/
+    s/^\(XGETTEXT_OPTIONS\) *=.*/\1 = '"$XGETTEXT_OPTIONS_RUNTIME"'/
+  ' <po/Makevars >runtime-po/Makevars
 
   # Copy identical files from po to runtime-po.
   (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
Index: bootstrap.conf
===================================================================
RCS file: /cvsroot/bison/bison/bootstrap.conf,v
retrieving revision 1.3
diff -p -u -r1.3 bootstrap.conf
--- bootstrap.conf      13 Oct 2006 05:00:25 -0000      1.3
+++ bootstrap.conf      8 Nov 2006 19:59:51 -0000
@@ -47,7 +47,6 @@ XGETTEXT_OPTIONS_RUNTIME=$XGETTEXT_OPTIO
 # Gettext supplies these files, but we don't need them since
 # we don't have an intl subdirectory.
 excluded_files='
-    m4/codeset.m4
     m4/glibc2.m4
     m4/glibc21.m4
     m4/intdiv0.m4
@@ -62,6 +61,5 @@ excluded_files='
     m4/uintmax_t.m4
     m4/ulonglong.m4
     m4/visibility.m4
-    m4/wint_t.m4
     m4/xsize.m4
 '