From 394ad4fb9b1c9f565e3f07b187950be13758df7a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 23 Jun 2023 00:48:13 +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 . * doc/Makefile.am (MAKEINFO): New variable. * cfg.mk (_makefile_at_at_check_exceptions): New variable. --- cfg.mk | 3 +++ doc/Makefile.am | 4 ++++ 2 files changed, 7 insertions(+) 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 . +# 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 -- 2.34.1