diff options
| author | Jim Meyering <meyering@redhat.com> | 2008-01-28 15:16:17 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2008-01-29 09:40:31 +0100 |
| commit | a7f5e64909fa24ecf2ef72a8cc3070cf38332842 (patch) | |
| tree | 3f973f5ca4f7e65706c2d1ffcf09231c3e024e71 /GNUmakefile | |
| parent | 533391a2a75f49da27adc71214caeeb4ef07d81c (diff) | |
| download | coreutils-a7f5e64909fa24ecf2ef72a8cc3070cf38332842.tar.xz | |
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 <meyering@redhat.com>
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 7 |
1 files changed, 6 insertions, 1 deletions
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 |