* NEWS (2.5): Fix minor typos.

[bison.git] / bootstrap.conf

diff --git a/bootstrap.conf b/bootstrap.conf
index 2d522e25b64bde78882325c8113d99417fb78f71..2de61cb5fb2917d0784707cf474d5524985c6eed 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.
 
-# Copyright (C) 2006-2010 Free Software Foundation, Inc.
+# Copyright (C) 2006-2011 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,8 +20,8 @@ gnulib_modules='
   announce-gen argmatch assert config-h c-strcase configmake dirname
   error extensions fopen-safer gendocs getopt-gnu gettext
   git-version-gen hash inttypes javacomp-script javaexec-script
-  maintainer-makefile malloc mbswidth obstack quote quotearg
-  realloc-posix stdbool stpcpy strerror strtoul strverscmp unistd
+  maintainer-makefile malloc-gnu mbswidth obstack quote quotearg
+  realloc-posix spawn-pipe stdbool stpcpy strerror strtoul strverscmp unistd
   unistd-safer unlocked-io update-copyright unsetenv verify warnings
   xalloc xalloc-die xstrndup
 
@@ -45,25 +45,36 @@ XGETTEXT_OPTIONS_RUNTIME=$XGETTEXT_OPTIONS'\\\
 # 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
     m4/intl.m4
     m4/intldir.m4
     m4/intmax.m4
-    m4/inttypes_h.m4
     m4/lcmessage.m4
     m4/lock.m4
     m4/longdouble.m4
     m4/signed.m4
-    m4/size_max.m4
     m4/uintmax_t.m4
     m4/ulonglong.m4
     m4/visibility.m4
-    m4/xsize.m4
 '
 
-# In directories like lib/, m4/, and po/, generate both these files because we
-# still try to support CVS emulation.
-vc_ignore='.cvsignore .gitignore'
+# Massage lib/gnulib.mk before using it later in the bootstrapping process.
+gnulib_mk_hook()
+{
+  etc/prefix-gnulib-mk $1
+}
+
+bootstrap_epilogue()
+{
+  # Make sure we don't need src/bison, which usually doesn't exist at
+  # the time of a bootstrap.
+  touch src/parse-gram.[ch]
+}
+
+# Keep our bootstrap script in sync with gnulib's.  If we ever need to
+# maintain our own bootstrap script again, set this to false, remove
+# the bootstrap entry from the file .x-update-copyright, and add any
+# needed copyright years to the copyright statement in the bootstrap
+# script.
+bootstrap_sync=true