From: Karl Berry <karl@freefriends.org>
Date: Tue, 30 May 2023 00:54:07 +0000 (-0700)
Subject: doc: improve NAME string for man pages.
X-Git-Tag: v1.16i~51
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=5b87f66c8a51949ee58e254159518818c7c1b6f9;p=thirdparty%2Fautomake.git

doc: improve NAME string for man pages.

This change fixes https://bugs.gnu.org/62853 and
https://bugs.gnu.org/62854.

* doc/local.mk (update_mans): move $(AM_V_GEN): to calls;
include --name="$${HELP2MAN_NAME}".
(-%D%/aclocal-$(APIVERSION).1, %D%/automake-$(APIVERSION).1):
set HELP2MAN_NAME in environment to pass to help2man.
---

diff --git a/doc/local.mk b/doc/local.mk
index f76d6d66f..f7313e150 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -36,9 +36,10 @@ CLEANFILES += $(man1_MANS)
 EXTRA_DIST += %D%/help2man
 
 update_mans = \
-  $(AM_V_GEN): \
-    && $(MKDIR_P) %D% \
-    && AUTOMAKE_HELP2MAN=true ./pre-inst-env $(PERL) $(srcdir)/%D%/help2man --output=$@ --info-page=automake
+    $(MKDIR_P) %D% \
+    && AUTOMAKE_HELP2MAN=true ./pre-inst-env \
+       $(PERL) $(srcdir)/%D%/help2man --output=$@ --info-page=automake \
+               --name="$${HELP2MAN_NAME}"
 
 %D%/aclocal.1 %D%/automake.1:
 	$(AM_V_GEN): \
@@ -47,9 +48,9 @@ update_mans = \
 	  && echo ".so man1/$$f-$(APIVERSION).1" > $@
 
 %D%/aclocal-$(APIVERSION).1: $(aclocal_script) lib/Automake/Config.pm
-	$(update_mans) $(aclocal_script)
+	$(AM_V_GEN):; HELP2MAN_NAME="Generate aclocal.m4 by scanning configure.ac"; export HELP2MAN_NAME; $(update_mans) $(aclocal_script)
 %D%/automake-$(APIVERSION).1: $(automake_script) lib/Automake/Config.pm
-	$(update_mans) $(automake_script)
+	$(AM_V_GEN):; HELP2MAN_NAME="Generate Makefile.in files for configure from Makefile.am"; export HELP2MAN_NAME; $(update_mans) $(automake_script)
 
 ## This target is not invoked as a dependency of anything. It exists
 ## merely to make checking the links in automake.texi (that is,