From 267184ec9a060c088e1feab717120e43911485e5 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 7 Jan 2024 16:54:12 -0800 Subject: [PATCH] doc: adjust to texinfo 7.1 * doc/Makefile (MAKEINFO): Adjust to texinfo 7.1, where makeinfo by default outputs ASCII approximations to characters. --- ChangeLog | 6 ++++++ doc/Makefile | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e2f4b73fb..8bfff58a1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-01-07 Paul Eggert + + doc: adjust to texinfo 7.1 + * doc/Makefile (MAKEINFO): Adjust to texinfo 7.1, where makeinfo + by default outputs ASCII approximations to characters. + 2024-01-02 Bruno Haible strverscmp: Work around bug in musl libc 1.2.3 and in Cygwin. diff --git a/doc/Makefile b/doc/Makefile index 19e3c34dde..2cb1dc2e77 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -9,9 +9,11 @@ doc = gnulib lang_env = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= makeinfo_prog = makeinfo -# The customization variable CHECK_NORMAL_MENU_STRUCTURE is necessary with -# makeinfo versions ≥ 6.8. -MAKEINFO = $(lang_env) $(makeinfo_prog) -c CHECK_NORMAL_MENU_STRUCTURE=1 +# ASCII_DASHES_AND_QUOTES=0 is needed for makeinfo versions ≥ 7.1. +# CHECK_NORMAL_MENU_STRUCTURE=1 is needed for makeinfo versions ≥ 6.8. +MAKEINFO = $(lang_env) $(makeinfo_prog) \ + -c ASCII_DASHES_AND_QUOTES=0 \ + -c CHECK_NORMAL_MENU_STRUCTURE=1 manual_opts = --no-split --reference-limit=2000 TEXI2HTML = $(MAKEINFO) $(manual_opts) --html -- 2.39.5