From 662cd06405c078f7b9a2ab1cbab9f36131269979 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 21 Jul 2008 21:45:30 -0600 Subject: [PATCH] Warn, not fail, on stale version. * top/GNUmakefile (_curr-ver): Tone down previous patch. Signed-off-by: Eric Blake --- ChangeLog | 3 +++ top/GNUmakefile | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef2f20ab9..f741b9ffc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-07-21 Eric Blake + Warn, not fail, on stale version. + * top/GNUmakefile (_curr-ver): Tone down previous patch. + Don't allow installation with stale devel version number. * top/GNUmakefile (_is-install-target): New macro. (_curr-ver): Forbid installation with stale version number. diff --git a/top/GNUmakefile b/top/GNUmakefile index 0f1bba932..ea5e72c44 100644 --- a/top/GNUmakefile +++ b/top/GNUmakefile @@ -67,10 +67,10 @@ ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL)) # recompilation after 'make all'. But as long as changing the version # string alters config.h, the cost of having 'make all' always have an # up-to-date version is prohibitive. So, as a compromise, we merely - # refuse to install if the version string is out of date; the user - # must run 'autoreconf' (or something like 'make distcheck') to + # warn when installing a version string that is out of date; the user + # should run 'autoreconf' (or something like 'make distcheck') to # fix the version, 'make all' to propagate it, then 'make install'. - $(error version string $(VERSION) is out of date; run autoreconf before installing) + $(info WARNING: version string $(VERSION) is out of date; run autoreconf -f to fix it) else $(info INFO: running autoreconf for new version string: $(_curr-ver)) _dummy := $(shell cd $(srcdir) && rm -rf autom4te.cache .version \ -- 2.11.0