From: Bruno Haible <bruno@clisp.org>
Date: Thu, 22 Jun 2023 21:59:11 +0000 (+0200)
Subject: build: ensure that makeinfo ≥ 6.8 checks the @menu structure
X-Git-Tag: v9.4~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e600fbb7648c206099177bb7a1d253f1dccd7409;p=thirdparty%2Fcoreutils.git

build: ensure that makeinfo ≥ 6.8 checks the @menu structure

See <https://lists.gnu.org/r/bug-texinfo/2023-06/msg00015.html>.

* doc/local.mk (MAKEINFO): New variable.
* cfg.mk (_makefile_at_at_check_exceptions): Update.
---

diff --git a/cfg.mk b/cfg.mk
index 92f119ee2f..6ba8981abc 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -52,7 +52,8 @@ export XZ_OPT = -8e
 old_NEWS_hash = ac6cb1c35890b53e56acbfbb078fcd53
 
 # Add an exemption for sc_makefile_at_at_check.
-_makefile_at_at_check_exceptions = ' && !/^cu_install_prog/ && !/dynamic-dep/'
+_makefile_at_at_check_exceptions = \
+  ' && !/MAKEINFO/ && !/^cu_install_prog/ && !/dynamic-dep/'
 
 # Our help-version script is in a slightly different location.
 _hv_file ?= $(srcdir)/tests/misc/help-version
diff --git a/doc/local.mk b/doc/local.mk
index 9714d5b181..b5a6c33b6f 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -25,6 +25,10 @@ doc_coreutils_TEXINFOS = \
   doc/fdl.texi \
   doc/sort-version.texi
 
+# The customization variable CHECK_NORMAL_MENU_STRUCTURE is necessary with
+# makeinfo versions ≥ 6.8.
+MAKEINFO = @MAKEINFO@ -c CHECK_NORMAL_MENU_STRUCTURE=1
+
 # The following is necessary if the package name is 8 characters or longer.
 # If the info documentation would be split into 10 or more separate files,
 # then this is necessary even if the package name is 7 characters long.