From b9168da314d99e1b8fc81cf53b6ef6b0e26461af Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Fri, 23 Jun 2023 01:33:58 +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/local.mk (MAKEINFO): New variable.
* cfg.mk (_makefile_at_at_check_exceptions): New variable.
---
 cfg.mk       | 3 +++
 doc/local.mk | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/cfg.mk b/cfg.mk
index 9d7dce4..b18df67 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -305,6 +305,9 @@ sc_prohibit_operator_at_end_of_line:
 	halt='found operator at end of line'				\
 	  $(_sc_search_regexp)
 
+# Add an exemption for sc_makefile_at_at_check.
+_makefile_at_at_check_exceptions = ' && !/MAKEINFO/'
+
 update-copyright-env = \
   UPDATE_COPYRIGHT_USE_INTERVALS=2 \
   UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79
diff --git a/doc/local.mk b/doc/local.mk
index 50abc8f..14ecb19 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -21,6 +21,10 @@ HELP2MAN = $(top_srcdir)/build-aux/help2man
 SEDBIN = sed/sed
 EXTRA_DIST += doc/dummy-man
 
+# The customization variable CHECK_NORMAL_MENU_STRUCTURE is necessary with
+# makeinfo versions ≥ 6.8.
+MAKEINFO = @MAKEINFO@ -c CHECK_NORMAL_MENU_STRUCTURE=1
+
 AM_MAKEINFOHTMLFLAGS = --no-split
 
 ## Use the distributed man pages if cross compiling or lack perl
-- 
2.34.1