On 02/02/2026 16:40, Pádraig Brady wrote:
On 18/01/2026 20:25, Collin Funk wrote:
Pádraig Brady <[email protected]> writes:
diff --git a/doc/local.mk b/doc/local.mk
index 04ce909e9..6f80cb189 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -25,9 +25,11 @@ doc_coreutils_TEXINFOS = \
doc/fdl.texi \
doc/sort-version.texi
+MAKEINFO = $(abs_top_srcdir)/build-aux/makeinfo-wrapper.sh
I think that should be ${abs_top_builddir} to support VPATH builds.
Nice catch. My patch didn't work after running ./configure in a
subdirectory, but using $(abs_top_builddir) fixes it.
+MAKEINFO = $(abs_top_srcdir)/build-aux/makeinfo-wrapper.sh
+
# The customization variable CHECK_NORMAL_MENU_STRUCTURE is necessary with
# makeinfo versions ≥ 6.8.
-MAKEINFO = @MAKEINFO@ -c CHECK_NORMAL_MENU_STRUCTURE=1
+MAKEINFOFLAGS = -c CHECK_NORMAL_MENU_STRUCTURE=1
I notice there are also AM_MAKEINFOFLAGS passed.
Should we be using that, rather than overriding
variables the user may set at configure/build time?
Yes, that is correct. It seems I read the Automake manual very poorly
yesterday.
Pushed the patch after those two changes [1].
Thanks,
Collin
[1]
https://github.com/coreutils/coreutils/commit/740d33b8da14cf410057249f884cf7a612b28d6b
I'm making this further change
as otherwise MAKEINFO wasn't propagated through `make web-manual`
cheers,
Padraig
commit af6ac27441116db7371d8173b6f3767ad983ca33 (HEAD -> master)
Author: Pádraig Brady <[email protected]>
Date: Mon Feb 2 16:34:31 2026 +0000
doc: ensure web-manual is post processed
* doc/local.mk: export MAKEINFO so that it propagates to gendocs.sh,
as was the case before commit v9.9-207-g740d33b8d
diff --git a/doc/local.mk b/doc/local.mk
index 129def7cd..033a8aab0 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -25,7 +25,7 @@ doc_coreutils_TEXINFOS = \
doc/fdl.texi \
doc/sort-version.texi
-MAKEINFO = $(abs_top_builddir)/build-aux/makeinfo-wrapper.sh
+export MAKEINFO = $(abs_top_builddir)/build-aux/makeinfo-wrapper.sh
# The customization variable CHECK_NORMAL_MENU_STRUCTURE is necessary with
# makeinfo versions ≥ 6.8.
Hrm, even though `export ...` is POSIX supported,
testing on solaris 11 suggests it may give "Badly formed macro assignment".
I suspect that's why it was restricted to cfg.mk and thus GNU make.
I'm thinking perhaps of reverting v9.9-207-g740d33b8d
so that the post processing / web manual is restricted to GNU make.
non-gnu make will still work, just without the adjusted anchors.
cheers,
Padraig
