From b69f240e06b92951d389f8dd291914d61f0b29e4 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 11 Nov 2007 21:14:20 +0100 Subject: [PATCH] Remove the autoreconf-provided INSTALL, so that we regenerate it. * GNUmakefile (dummy): Remove INSTALL. --- ChangeLog | 3 +++ GNUmakefile | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 770b9268..16ddf6a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-11-12 Jim Meyering + Remove the autoreconf-provided INSTALL, so that we regenerate it. + * GNUmakefile (dummy): Remove INSTALL. + Remove racy commands to build scripts in bin/ and tests/. * man/Makefile.am (.x.1): Now that scripts in bin/ and tests/ are guaranteed to be built, remove the rules that tried to build diff --git a/GNUmakefile b/GNUmakefile index cec6444a..8929a243 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -47,13 +47,14 @@ include Makefile # for others: rerunning autoconf and recompiling everything isn't cheap. # The $(MAKE) clean is required, to remove all traces of the previous # version string, which would otherwise cause a few test failures. +# Remove the autoreconf-provided INSTALL, so that we regenerate it. ifeq (0,$(MAKELEVEL)) _is-dist-target = $(filter dist% alpha beta major,$(MAKECMDGOALS)) ifneq (,$(_is-dist-target)) _curr-ver := $(shell build-aux/git-version-gen $(srcdir) .version) ifneq ($(_curr-ver),$(VERSION)) $(info INFO: running autoreconf for new version string: $(_curr-ver)) - dummy := $(shell rm -rf autom4te.cache; autoreconf -i && $(MAKE) clean) + dummy := $(shell rm -rf autom4te.cache; autoreconf -i && $(MAKE) clean && rm -f INSTALL) endif endif endif