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 --- GNUmakefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index 9502203f6..af73b7ee3 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -49,11 +49,16 @@ ifeq (0,$(MAKELEVEL)) ifneq ($(_curr-ver),$(VERSION)) $(info INFO: running autoreconf for new version string: $(_curr-ver)) dummy := $(shell rm -rf autom4te.cache; autoreconf) - dummy := $(shell echo $(_curr-ver) > VERSION) + dummy := $(shell echo $(_curr-ver) > .version) + _created_version_file = 1 endif endif endif +ifneq ($(_created_version_file),1) + dummy := $(shell test -f .version || echo $(VERSION) > .version) +endif + include $(srcdir)/Makefile.cfg include $(srcdir)/Makefile.maint -- cgit v1.2.3-54-g00ecf