From 3883e797bf792736f86a6548694aee28330d5777 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Fri, 23 Jun 2023 00:57:21 +0200
Subject: [PATCH] =?UTF-8?q?build:=20Ensure=20that=20makeinfo=20=E2=89=A5?=
 =?UTF-8?q?=206.8=20checks=20the=20@menu=20structure.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.
---
 cfg.mk          | 3 +++
 doc/Makefile.am | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/cfg.mk b/cfg.mk
index 7b27a2a..49da6a8 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -103,3 +103,6 @@ export _gl_TS_unmarked_extern_vars = \
   match_start prev_length max_chain_length good_match nice_match
 
 _gl_TS_extern = (?:_Noreturn )?extern
+
+# Add an exemption for sc_makefile_at_at_check.
+_makefile_at_at_check_exceptions = ' && !/MAKEINFO/'
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 608e120..daf9cd3 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -17,6 +17,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
+
+# The customization variable CHECK_NORMAL_MENU_STRUCTURE is necessary with
+# makeinfo versions ≥ 6.8.
+MAKEINFO = @MAKEINFO@ -c CHECK_NORMAL_MENU_STRUCTURE=1
+
 info_TEXINFOS = gzip.texi
 
 gzip_TEXINFOS = fdl.texi
-- 
2.34.1