[groff] 01/01: gnulib: replace non-recursive-gnulib-prefix-hack with automake-subdir option

[Bertrand Garrigues]

bgarrigues pushed a commit to branch master
in repository groff.

commit 49ff8b07706ee7afa536bdf07c061d56ac16efda
Author: Bertrand Garrigues <bertrand.garrigues@laposte.net>
AuthorDate: Sun Apr 24 11:38:06 2022 +0200

    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>).
---
 bootstrap.conf   | 7 +++----
 doc/automake.mom | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index b2bc12d7..5ad0e53e 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
 }
diff --git a/doc/automake.mom b/doc/automake.mom
index 5dab4b04..43107974 100644
--- a/doc/automake.mom
+++ b/doc/automake.mom
@@ -1,6 +1,6 @@
 .\" -*- mode: text; coding: utf-8; -*-
 .\"
-.\" Copyright ©2014, 2017 Free Software Foundation
+.\" Copyright ©2014 - 2022 Free Software Foundation
 .\" 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
 .\"
 .\" Permission is hereby granted, free of charge, to any person
@@ -543,7 +543,7 @@ and the file will be instantly rebuilt, while on a 
recursive make
 system, `make' will have to be invoked in all the sub-directories.
 .PP
 Note also that in order to make `gnulib' work with this
-non-recursive schema, the `non-recursive-gnulib-prefix-hack'
+non-recursive schema, the `--automake-subdir'
 configuration should be selected in bootstrap.conf.
 .
 .HEADING 1 "Installing data"