[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 13/22] build: rename dist_man1_MANS -> man1_MANS
From: |
Stefano Lattarini |
Subject: |
[PATCH 13/22] build: rename dist_man1_MANS -> man1_MANS |
Date: |
Sat, 1 Sep 2012 01:46:50 +0200 |
And list $(man1_MANS) directly in $(EXTRA_DIST) instead. This
offers more similarity to what is done for $(EXTRA_MANS)
* man/local.mk (dist_man1_MANS): Rename ...
(man1_MANS): ... like this.
(EXTRA_DIST): Add its contents.
* cfg.mk (check-x-vs-1): Fix a botched comment.
---
cfg.mk | 2 +-
man/local.mk | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/cfg.mk b/cfg.mk
index 2323fa3..a3a4d4c 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -206,7 +206,7 @@ sc_option_desc_uppercase: $(ALL_MANS)
sc_man_file_correlation: check-x-vs-1 check-programs-vs-x
# Ensure that for each .x file in the 'man/' subdirectory, there is a
-# corresponding .1 file in the definition of $(dist_man1_MANS).
+# corresponding .1 file in the definition of $(EXTRA_MANS).
# But since that expansion usually lacks programs like arch and hostname,
# add them here manually.
.PHONY: check-x-vs-1
diff --git a/man/local.mk b/man/local.mk
index 717a877..5e89829 100644
--- a/man/local.mk
+++ b/man/local.mk
@@ -16,16 +16,18 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-dist_man1_MANS = $(MAN)
+EXTRA_DIST += man/help2man
-EXTRA_DIST += $(dist_man1_MANS:.1=.x) man/help2man
-MAINTAINERCLEANFILES += $(dist_man1_MANS)
+man1_MANS = $(MAN)
+
+EXTRA_DIST += $(man1_MANS) $(man1_MANS:.1=.x)
+MAINTAINERCLEANFILES += $(man1_MANS)
EXTRA_MANS = @EXTRA_MANS@
EXTRA_DIST += $(EXTRA_MANS) $(EXTRA_MANS:.1=.x)
-ALL_MANS = $(dist_man1_MANS) $(EXTRA_MANS)
+ALL_MANS = $(man1_MANS) $(EXTRA_MANS)
# This is required because we have subtle inter-directory dependencies:
# in order to generate all man pages, even those for which we don't
--
1.7.12
- [PATCH 04/22] build: fix generation of manpages for programs not built by default, (continued)
- [PATCH 04/22] build: fix generation of manpages for programs not built by default, Stefano Lattarini, 2012/08/31
- [PATCH 05/22] maint: improve remake rules for maintainers, Stefano Lattarini, 2012/08/31
- [PATCH 06/22] maint: remove unused target 'install-root', Stefano Lattarini, 2012/08/31
- [PATCH 07/22] maint: fix and simplify maintainer checks, Stefano Lattarini, 2012/08/31
- [PATCH 09/22] maint: update gitignore entries, Stefano Lattarini, 2012/08/31
- [PATCH 08/22] maint: fix one stray reference to src/Makefile.am, Stefano Lattarini, 2012/08/31
- [PATCH 03/22] build: don't use recursive make to build the 'src' subdirectory, Stefano Lattarini, 2012/08/31
- [PATCH 10/22] build: simplify: get rid of some indirection variables, Stefano Lattarini, 2012/08/31
- [PATCH 12/22] build: one less unneeded make variable, Stefano Lattarini, 2012/08/31
- [PATCH 11/22] build: simplify and make more portable to non-GNU make, Stefano Lattarini, 2012/08/31
- [PATCH 13/22] build: rename dist_man1_MANS -> man1_MANS,
Stefano Lattarini <=
- [PATCH 14/22] build: simplify: get rid of yet some more indirection variables, Stefano Lattarini, 2012/08/31
- [PATCH 15/22] build: enhance man pages cleaning and dependencies, Stefano Lattarini, 2012/08/31
- [PATCH 16/22] build: $(mandeps): new, factors out man pages dependencies, Stefano Lattarini, 2012/08/31
- [PATCH 17/22] maint: simplify declaration of "libexec" programs, Stefano Lattarini, 2012/08/31
- [PATCH 18/22] maint: typofix in comments, Stefano Lattarini, 2012/08/31
- [PATCH 19/22] maint: fix quoting problem in configure.ac, Stefano Lattarini, 2012/08/31
- [PATCH 20/22] build: fix VPATH issues in C compilation, Stefano Lattarini, 2012/08/31
- [PATCH 22/22] maint: avoid distcheck failure by properly cleaning $(EXTRA_MANS), Stefano Lattarini, 2012/08/31
- [PATCH 21/22] maint: port manpages generation to VPATH builds, Stefano Lattarini, 2012/08/31