build: generalize etc/prefix-gnulib-mk

[bison.git] / bootstrap.conf

diff --git a/bootstrap.conf b/bootstrap.conf
index e020407f2477356a421d387761b5525bde5fe6e5..599b778f0eb26a5420ec98a1b478f8ae70e2d6c5 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -19,7 +19,8 @@
 gnulib_modules='
   announce-gen argmatch assert calloc-posix close config-h c-strcase
   configmake dirname error extensions fdl fopen-safer gendocs getopt-gnu
-  gettext git-version-gen hash inttypes isnan javacomp-script
+  gettext git-version-gen gitlog-to-changelog
+  gpl-3.0 hash inttypes isnan javacomp-script
   javaexec-script ldexpl maintainer-makefile malloc-gnu mbschr mbsrchr
   mbswidth obstack perror pipe-posix quote quotearg realloc-posix
   spawn-pipe stdbool stpcpy strdup-posix strerror strtoul strverscmp
@@ -60,10 +61,15 @@ excluded_files='
     m4/visibility.m4
 '
 
-# Massage lib/gnulib.mk before using it later in the bootstrapping process.
-gnulib_mk_hook()
+gnulib_tool_option_extras='--symlink --makefile-name=gnulib.mk'
+
+bootstrap_post_import_hook()
 {
-  etc/prefix-gnulib-mk $1
+  # 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
 }
 
 bootstrap_epilogue()
@@ -78,4 +84,4 @@ bootstrap_epilogue()
 # 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
+# FIXME: temporary bootstrap_sync=true