diff options
| author | Bertrand Garrigues <bertrand.garrigues@laposte.net> | 2022-04-24 11:38:06 +0200 |
|---|---|---|
| committer | Bertrand Garrigues <bertrand.garrigues@laposte.net> | 2022-04-24 11:57:14 +0200 |
| commit | 49ff8b07706ee7afa536bdf07c061d56ac16efda (patch) | |
| tree | 04ffc43665c4597004be8ec6b5fdaecebaa6b0a7 /bootstrap.conf | |
| parent | f55d8f418935e4f63f2a54ea2fa99e25b42767f8 (diff) | |
| download | groff-git-49ff8b07706ee7afa536bdf07c061d56ac16efda.tar.gz | |
gnulib: replace non-recursive-gnulib-prefix-hack with automake-subdir option
'non-recursive-gnulib-prefix-hack' is deprecated by gnulib's commit
f8eed11b15e9141d061900e4068ea1f3ba9b63f6 and replaced by
'--automake-subdir'.
* bootstrap.conf:
(gnulib_modules): Remove option 'non-recursive-gnulib-prefix-hack'.
(gnulib_tool_option_extras): Add option '--automake-subdir'.
(bootstrap_post_import_hook): Remove the invocation of '
build-aux/prefix-gnulib-mk'.
* doc/automake.mom: update documentation accordingly.
Fixes <http://savannah.gnu.org/bugs/?61708> and
<https://savannah.gnu.org/bugs/?62205> , issues reported and fix
suggested by Bjarni Ingi Gislason <bjarniig@rhi.hi.is>. Fix also
suggested by Werner LEMBERG <wl@gnu.org> (see
<https://repo.or.cz/ttfautohint.git/commit/a938fc63cb55ef48393a924d7083b13c1352d294>).
Diffstat (limited to 'bootstrap.conf')
| -rw-r--r-- | bootstrap.conf | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bootstrap.conf b/bootstrap.conf index b2bc12d7c..5ad0e53e1 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -38,7 +38,6 @@ checkout_only_file=README.git gnulib_modules=" git-version-gen havelib - non-recursive-gnulib-prefix-hack wcwidth fprintf-posix snprintf @@ -46,7 +45,9 @@ gnulib_modules=" " # Name of the Makefile.am -gnulib_tool_option_extras="--makefile-name=gnulib.mk" +gnulib_tool_option_extras=" + --makefile-name=gnulib.mk + --automake-subdir" # Additional xgettext options to use. Use "\\\newline" to break lines. XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\ @@ -99,6 +100,4 @@ bootstrap_post_import_hook () { # Automake requires that ChangeLog exist. touch ChangeLog || return 1 - # Massage lib/gnulib.mk before using it later in the bootstrapping process. - build-aux/prefix-gnulib-mk --lib-name=$gnulib_name lib/$gnulib_mk } |