[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Remove the autoreconf-provided INSTALL, so that we regenerate it.
From: |
Jim Meyering |
Subject: |
Remove the autoreconf-provided INSTALL, so that we regenerate it. |
Date: |
Sun, 11 Nov 2007 21:16:46 +0100 |
Jim Meyering <address@hidden> wrote:
> Ralf Wildenhues <address@hidden> wrote:
>
> Hi Ralf,
>
>> * Jim Meyering wrote on Sat, Nov 10, 2007 at 10:28:42PM CET:
>>> I was surprised to see diffs after running make with one of
>>> the clean targets. These were the culprits:
>>>
>>> Remove generated files from version control.
>>> * INSTALL: Remove generated file.
>>> * lib/autoscan/autoscan.list: Remove generated file.
>>
>> Well, after this patch I get a build failure. So I do
>> autoreconf -i
>>
>> which causes automake to install (an outdated copy of) `INSTALL'.
>> This copy is not updated again later, though. So unless
>> doc/install.texi changes in-between the last time `autoreconf -i'
>> is run, and `make dist', the distribution will carry the wrong file.
>
> Good point.
> I noticed that autoconf's INSTALL was built,
> but forgot that the build procedure would pull
> in an out of date copy.
>
> I'll ensure that INSTALL is regenerated, one way or another,
> at least for distribution.
Hi Ralf,
This patch addresses the problem.
I'll push this tomorrow:
Remove the autoreconf-provided INSTALL, so that we regenerate it.
* GNUmakefile (dummy): Remove INSTALL.
---
ChangeLog | 3 +++
GNUmakefile | 3 ++-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5fe4709..79f6af8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2007-11-11 Jim Meyering <address@hidden>
+ 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 cec6444..8929a24 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
--
1.5.3.5.622.g6fd7a