Merge remote-tracking branch 'origin/maint'

[bison.git] / bootstrap.conf

diff --git a/bootstrap.conf b/bootstrap.conf
index e1fd5484cc5950ff0cc42cc2ddd8c0cb99fd2921..cff387f98b94a16404b0ac565cecc64887e7713a 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -17,16 +17,25 @@
 
 # gnulib modules used by this package.
 gnulib_modules='
-  announce-gen argmatch assert calloc-posix close closeout config-h c-strcase
-  configmake dirname error extensions fdl fopen-safer gendocs getopt-gnu
+  argmatch assert calloc-posix close closeout config-h c-strcase
+  configmake
+  dirname
+  error extensions fdl fopen-safer getopt-gnu
   gettext git-version-gen gitlog-to-changelog
   gpl-3.0 hash inttypes isnan javacomp-script
-  javaexec-script ldexpl maintainer-makefile malloc-gnu mbschr mbsrchr
+  javaexec-script ldexpl malloc-gnu
   mbswidth obstack perror progname
-  quote quotearg realloc-posix
+  quote quotearg
+  readme-release
+  realloc-posix
   spawn-pipe stdbool stpcpy strdup-posix strerror strtoul strverscmp
   unistd unistd-safer unlocked-io update-copyright unsetenv verify
-  warnings xalloc xalloc-die xstrndup
+  warnings
+  xalloc
+  xalloc-die
+  xconcat-filename
+  xmemdup0
+  xstrndup
 
   fprintf-posix printf-posix snprintf-posix sprintf-posix
   vsnprintf-posix vsprintf-posix
@@ -66,6 +75,9 @@ gnulib_tool_option_extras='--symlink --makefile-name=gnulib.mk'
 
 bootstrap_post_import_hook()
 {
+  # Massage lib/gnulib.mk before using it later in the bootstrapping process.
+  etc/prefix-gnulib-mk --lib-name=$gnulib_name lib/$gnulib_mk
+
   # Ensure that ChangeLog exists, for automake.
   test -f ChangeLog || touch ChangeLog
 }
@@ -75,6 +87,8 @@ 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]
+
+  perl -pi -e "s/\@PACKAGE\@/$package/g" README-release
 }
 
 # Keep our bootstrap script in sync with gnulib's.  If we ever need to