build: simplify: get rid of yet some more indirection variables

* configure.ac: Adjust and improve few comments.
(MAN): Rename ...
(man1_MANS): ... to this.
Ensure it isn't initialized in all Makefiles (which would lead
to spurious errors), by calling AM_SUBST_NOTMAKE on it.
Also call AM_SUBST_NOTMAKE on 'EXTRA_MANS', for consistency.
* man/local.mk (man1_MANS): Simply define to '@man1_MANS@'.

diff --git a/configure.ac b/configure.ac
index 43df401b7dd5271c382e93435804dcf7ed6c4372..cd0dbe00dd432b1c97de6d8d9de114da6840fc7a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -427,9 +427,9 @@ case " $optional_bin_progs " in
   *' stdbuf '*) gl_ADD_PROG([optional_pkglib_progs], [libstdbuf.so]) ;;
 esac
 
-MAN=`
+man1_MANS=`
   for p in $optional_bin_progs; do
-    # Change "ginstall.1" to "install.1" in $MAN.
+    # Change "ginstall.1" to "install.1".
     test $p = ginstall && p=install
     # Ignore the "[" program, since writing a portable make rule to
     # generate its manpage is not practical.
@@ -453,14 +453,15 @@ pkglibexec_PROGRAMS=`
   for p in $optional_pkglib_progs; do echo src/$p; done`
 
 # Normalize whitespace.
-MAN=`echo $MAN`
+man1_MANS=`echo $man1_MANS`
 EXTRA_MANS=`echo $EXTRA_MANS`
 bin_PROGRAMS=`echo $bin_PROGRAMS`
 pkglibexec_PROGS=`echo $pkglibexec_PROGRAMS`
 
 AC_SUBST([bin_PROGRAMS])        AM_SUBST_NOTMAKE([bin_PROGRAMS])
 AC_SUBST([pkglibexec_PROGRAMS]) AM_SUBST_NOTMAKE([pkglibexec_PROGRAMS])
-AC_SUBST([EXTRA_MANS])
+AC_SUBST([man1_MANS])           AM_SUBST_NOTMAKE([man1_MANS])
+AC_SUBST([EXTRA_MANS])          AM_SUBST_NOTMAKE([EXTRA_MANS])
 
 AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes])
 

diff --git a/man/local.mk b/man/local.mk
index 5e8982910f8623b6f46f4e922e385e8cdd59ab37..99eb2159b3a9f2c268dfb961d89051f9592e02f8 100644 (file)
--- a/man/local.mk
+++ b/man/local.mk
@@ -18,7 +18,7 @@
 
 EXTRA_DIST += man/help2man
 
-man1_MANS = $(MAN)
+man1_MANS = @man1_MANS@
 
 EXTRA_DIST += $(man1_MANS) $(man1_MANS:.1=.x)
 MAINTAINERCLEANFILES += $(man1_MANS)
@@ -149,8 +149,8 @@ man/whoami.1:    $(mandep)  src/whoami.c
 man/yes.1:       $(mandep)  src/yes.c
 
 # This is required so that changes to e.g., emit_bug_reporting_address
-# provoke regeneration of all $(MAN) files.
-$(MAN): $(top_srcdir)/src/system.h
+# provoke regeneration of all the manpages.
+$(man1_MANS): $(top_srcdir)/src/system.h
 
 .x.1:
        $(AM_V_GEN)case '$(PERL)' in                            \