build: rename dist_man1_MANS -> man1_MANS

And list $(man1_MANS) directly in $(EXTRA_DIST) instead.
This is similar to what is done for $(EXTRA_MANS), thus
improving consistency and readability.

* 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.
This commit is contained in:
Stefano Lattarini authored and Jim Meyering committed 2012-09-01 21:28:12 +02:00
1 parent f3244dcab6
commit 7ac3e4502e
2 files changed
+7 -5

No files matched your search

+1 -1
View File
@@ -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
+6 -4
View File
@@ -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