summaryrefslogtreecommitdiff
path: root/bootstrap.conf
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2021-12-18 18:45:46 +0100
committerAkim Demaille <akim.demaille@gmail.com>2021-12-19 17:11:30 +0100
commit013d59821994eda066fedceb0a137593244007ee (patch)
treef0cfa06b51f07f910dcfe1d937c55fdb420abb1e /bootstrap.conf
parent83a8f8b7076551dea6577163e3596c02f7686d55 (diff)
downloadbison-013d59821994eda066fedceb0a137593244007ee.tar.gz
gnulib: make use of gnulib-tool's --automake-subdir option
Starting this week, Gnulib supports generating a "non-recursive" Automake Makefile.am snippet https://lists.gnu.org/r/bug-gnulib/2021-12/msg00085.html. * bootstrap.conf: Use gnulib-tool's --automake-subdir.
Diffstat (limited to 'bootstrap.conf')
-rw-r--r--bootstrap.conf6
1 files changed, 1 insertions, 5 deletions
diff --git a/bootstrap.conf b/bootstrap.conf
index 1d8614e7..6b818fc6 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -34,7 +34,6 @@ gnulib_modules='
linked-list
malloc-gnu
mbfile mbswidth
- non-recursive-gnulib-prefix-hack
obstack
obstack-printf
perror progname
@@ -80,13 +79,10 @@ XGETTEXT_OPTIONS_RUNTIME=$XGETTEXT_OPTIONS'\\\
--keyword=YY_ \\\
'
-gnulib_tool_option_extras='--symlink --conditional-dependencies --makefile-name=gnulib.mk --po-base=gnulib-po --po-domain=bison'
+gnulib_tool_option_extras='--symlink --conditional-dependencies --makefile-name=gnulib.mk --automake-subdir --po-base=gnulib-po --po-domain=bison'
bootstrap_post_import_hook()
{
- # Massage lib/gnulib.mk before using it later in the bootstrapping process.
- build-aux/prefix-gnulib-mk --lib-name="$gnulib_name" "lib/$gnulib_mk"
-
# Ensure that ChangeLog exists, for automake.
test -f ChangeLog || touch ChangeLog
}