diff options
| author | Bruno Haible <bruno@clisp.org> | 2021-12-16 08:24:30 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2021-12-16 09:33:12 -0800 |
| commit | 3bf118dad0deed7fd25701a1c0ec3afd0a113ba9 (patch) | |
| tree | 97957dc4981d5f818d8dd43ec1184659926d7619 /bootstrap.conf | |
| parent | 064b31eb48610d81d6fa21ca2279a96497fb5a41 (diff) | |
| download | coreutils-3bf118dad0deed7fd25701a1c0ec3afd0a113ba9.tar.gz | |
build: non-recursive Automake in a less hacky way
* bootstrap.conf (gnulib_modules): Remove
non-recursive-gnulib-prefix-hack.
(gnulib_tool_option_extras): Add --automake-subdir.
(bootstrap_post_import_hook): No need to massage lib/gnulib.mk.
Diffstat (limited to 'bootstrap.conf')
| -rw-r--r-- | bootstrap.conf | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/bootstrap.conf b/bootstrap.conf index 2b66bc42d..c2f74f406 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -182,7 +182,6 @@ gnulib_modules=" mountlist mpsort netinet_in - non-recursive-gnulib-prefix-hack nproc nstrftime obstack @@ -339,7 +338,7 @@ XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\ ' gnulib_tool_option_extras="--tests-base=gnulib-tests --with-tests --symlink\ - --makefile-name=gnulib.mk + --makefile-name=gnulib.mk --automake-subdir " # Build prerequisites @@ -373,9 +372,6 @@ bootstrap_post_import_hook () && chmod a-w $tmp-1 $tmp-2 \ && mv -f $tmp-1 $m4f && mv -f $tmp-2 $mkf) - # Massage lib/gnulib.mk before using it later in the bootstrapping process. - build-aux/prefix-gnulib-mk --lib-name=$gnulib_name lib/$gnulib_mk - # Regenerate src/single-binary.mk (mkf=src/single-binary.mk tmp=single-binary.tmp \ && rm -f $mkf $tmp \ |