diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-09-01 01:46:51 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2012-09-01 21:28:12 +0200 |
| commit | 98954ce2aa95743fbcf155cf29a32b03f497efe0 (patch) | |
| tree | 5c4196cb7e94c1b0e6d1e12126c5ab0a1a3db25f | |
| parent | 7ac3e4502e62520e1855f5c8128ae658e1925ea2 (diff) | |
| download | coreutils-98954ce2aa95743fbcf155cf29a32b03f497efe0.tar.xz | |
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@'.
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | man/local.mk | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 43df401b7..cd0dbe00d 100644 --- 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 5e8982910..99eb2159b 100644 --- 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 \ |