From a7f5e64909fa24ecf2ef72a8cc3070cf38332842 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 28 Jan 2008 15:16:17 +0100 Subject: Avoid "make distcheck" failure: newly-created man/*.1 files not removed * Makefile.am (EXTRA_DIST): Add .version. (.version): New rule. (dist-hook): Don't create $(distdir)/.version here, now that it's being distributed. * man/Makefile.am (common_dep): Use ../.version, not ../VERSION. (../VERSION): Remove rule. * GNUmakefile (dummy): Create .version, not VERSION. Add an extra "...:= $(shell..." statement to ensure that .version exists even when the preceding code is not run. * .gitignore: Remove both .version and VERSION. Signed-off-by: Jim Meyering --- man/Makefile.am | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'man/Makefile.am') diff --git a/man/Makefile.am b/man/Makefile.am index 6cad1a44e..a4351d651 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -22,8 +22,8 @@ man_aux = $(dist_man_MANS:.1=.x) EXTRA_DIST = $(man_aux) $(NO_INSTALL_PROGS_DEFAULT:%=%.x) help2man MAINTAINERCLEANFILES = $(dist_man_MANS) -# Depend on ../VERSION to get version number changes. -common_dep = ../VERSION +# Depend on ../.version to get version number changes. +common_dep = ../.version # Note that arch depends on uname.c arch.1: $(common_dep) $(srcdir)/arch.x ../src/uname.c @@ -198,6 +198,3 @@ check-programs-vs-x: || { echo missing $$p.x 1>&2; status=1; }; \ done; \ exit $$status - -../VERSION: - echo $(VERSION) > $@-t && mv $@-t $@ -- cgit v1.2.3-54-g00ecf