grep branch, master, updated. v3.11-4-g68c7d2f

[Jim Meyering]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  68c7d2f51cdfa465d343f569d92e96a011ebf777 (commit)
       via  6980733869e8a0311c7eb26cb554dde6a1c26b5b (commit)
      from  95553c0661f066ea15345a020d3e3dcf380691c4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=68c7d2f51cdfa465d343f569d92e96a011ebf777


commit 68c7d2f51cdfa465d343f569d92e96a011ebf777
Author: Bruno Haible <bruno@clisp.org>
Date:   Fri Jun 23 00:48:13 2023 +0200

    build: Ensure that makeinfo ≥ 6.8 checks the @menu structure.
    
    See <https://lists.gnu.org/archive/html/bug-texinfo/2023-06/msg00015.html>.
    
    * doc/Makefile.am (MAKEINFO): New variable.
    * cfg.mk (_makefile_at_at_check_exceptions): New variable.

diff --git a/cfg.mk b/cfg.mk
index 1000d4f..8eec613 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -45,6 +45,9 @@ announcement_Cc_ = $(translation_project_), 
$(PACKAGE)-devel@gnu.org
 _gl_TS_unmarked_extern_functions = \
   main usage mb_clen to_uchar dfaerror dfawarn imbrlen
 
+# Add an exemption for sc_makefile_at_at_check.
+_makefile_at_at_check_exceptions = ' && !/MAKEINFO/'
+
 # Now that we have better tests, make this the default.
 export VERBOSE = yes
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4237af6..4bc2476 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -16,6 +16,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+# The customization variable CHECK_NORMAL_MENU_STRUCTURE is necessary with
+# makeinfo versions ≥ 6.8.
+MAKEINFO = @MAKEINFO@ -c CHECK_NORMAL_MENU_STRUCTURE=1
+
 info_TEXINFOS = grep.texi
 grep_TEXINFOS = fdl.texi
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=6980733869e8a0311c7eb26cb554dde6a1c26b5b


commit 68c7d2f51cdfa465d343f569d92e96a011ebf777
Author: Bruno Haible <bruno@clisp.org>
Date:   Fri Jun 23 00:48:13 2023 +0200

    build: Ensure that makeinfo ≥ 6.8 checks the @menu structure.
    
    See <https://lists.gnu.org/archive/html/bug-texinfo/2023-06/msg00015.html>.
    
    * doc/Makefile.am (MAKEINFO): New variable.
    * cfg.mk (_makefile_at_at_check_exceptions): New variable.

diff --git a/cfg.mk b/cfg.mk
index 1000d4f..8eec613 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -45,6 +45,9 @@ announcement_Cc_ = $(translation_project_), 
$(PACKAGE)-devel@gnu.org
 _gl_TS_unmarked_extern_functions = \
   main usage mb_clen to_uchar dfaerror dfawarn imbrlen
 
+# Add an exemption for sc_makefile_at_at_check.
+_makefile_at_at_check_exceptions = ' && !/MAKEINFO/'
+
 # Now that we have better tests, make this the default.
 export VERBOSE = yes
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4237af6..4bc2476 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -16,6 +16,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+# The customization variable CHECK_NORMAL_MENU_STRUCTURE is necessary with
+# makeinfo versions ≥ 6.8.
+MAKEINFO = @MAKEINFO@ -c CHECK_NORMAL_MENU_STRUCTURE=1
+
 info_TEXINFOS = grep.texi
 grep_TEXINFOS = fdl.texi
 

-----------------------------------------------------------------------

Summary of changes:
 cfg.mk          | 3 +++
 doc/Makefile.am | 4 ++++
 gnulib          | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
grep