maintainer-makefile: propagate MAKEINFO to gendocs

Make this change temporarily in coreutils.
Move to gnulib after v9.10 is released.

* top/maint.mk (web-manual): Propagate MAKEINFO explicitly,
rather than requiring it exported in the environment,
which can be awkward on Solaris make for example.

diff --git a/cfg.mk b/cfg.mk
index 1dfa4352a9516bffc304d9647541a35401ceca14..404927f0139a1c02e96bcfcfd2b85131346cefe9 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -943,7 +943,7 @@ _ll = ^src/longlong\.h$$
 exclude_file_name_regexp--sc_useless_cpp_parens = $(_ll)
 exclude_file_name_regexp--sc_space_before_open_paren = $(_ll)
 
-tbi_1 = ^tests/pr/|(\.mk|^man/help2man)$$
+tbi_1 = ^tests/pr/|(\.mk|^gl/.*\.diff|^man/help2man)$$
 tbi_2 = ^scripts/git-hooks/(pre-commit|pre-applypatch|applypatch-msg)$$
 tbi_3 = (GNU)?[Mm]akefile(\.am)?$$|$(_ll)
 exclude_file_name_regexp--sc_prohibit_tab_based_indentation = \

diff --git a/gl/local.mk b/gl/local.mk
index 8befebe0a57521cc22cf406d963f9b0287b96dda..56ffb585545b8423b502f2fa3921dbaf0112f786 100644 (file)
--- a/gl/local.mk
+++ b/gl/local.mk
@@ -81,4 +81,5 @@ gl/modules/targetdir \
 gl/modules/xdectoint \
 gl/modules/xfts \
 gl/tests/test-fadvise.c \
-gl/tests/test-rand-isaac.c
+gl/tests/test-rand-isaac.c \
+gl/top/maint.mk.diff

diff --git a/gl/top/maint.mk.diff b/gl/top/maint.mk.diff
new file mode 100644 (file)
index 0000000..44b9948
--- /dev/null
+++ b/gl/top/maint.mk.diff
@@ -0,0 +1,12 @@
+diff --git a/top/maint.mk b/top/maint.mk
+index ad60c8fb11..3475f3733c 100644
+--- a/top/maint.mk
++++ b/top/maint.mk
+@@ -1740,6 +1740,7 @@ web-manual:
+       $(AM_V_GEN)test -z "$(manual_title)" \
+         && { echo define manual_title in cfg.mk 1>&2; exit 1; } || :
+       $(AM_V_at)cd '$(srcdir)/doc'; \
++        MAKEINFO="$(MAKEINFO)" \
+         $(SHELL) ../$(_build-aux)/gendocs.sh $(gendocs_options_) \
+            -o '$(abs_builddir)/doc/manual' \
+            --email $(PACKAGE_BUGREPORT) $(PACKAGE) \