From: Jim Meyering Date: Tue, 26 Aug 2008 08:14:36 +0000 (+0200) Subject: GNUmakefile: cfg.mk definitions override default autoreconf-rerun policy X-Git-Tag: v0.1~7118 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=5682f5f5c354875d4b0a75a1d1b39795123a1518;p=gnulib.git GNUmakefile: cfg.mk definitions override default autoreconf-rerun policy * top/GNUmakefile (_is-dist-target, _is-install-target): Make these definitions conditional, so that they may be overridden, too. --- diff --git a/ChangeLog b/ChangeLog index 3aa2263fe..409ae1402 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-08-26 Jim Meyering + + GNUmakefile: cfg.mk definitions override default autoreconf-rerun policy + * top/GNUmakefile (_is-dist-target, _is-install-target): Make + these definitions conditional, so that they may be overridden, too. + 2008-08-26 Bruno Haible Generate INSTALL file variants with prettier quotes. diff --git a/top/GNUmakefile b/top/GNUmakefile index 7635e8dc5..4b4cf15cf 100644 --- a/top/GNUmakefile +++ b/top/GNUmakefile @@ -53,9 +53,9 @@ _autoreconf ?= autoreconf _have-git-version-gen := \ $(shell test -f $(srcdir)/$(_build-aux)/git-version-gen && echo yes) ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL)) - _is-dist-target = $(filter-out %clean, \ + _is-dist-target ?= $(filter-out %clean, \ $(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS))) - _is-install-target = $(filter-out %check, $(filter install%,$(MAKECMDGOALS))) + _is-install-target ?= $(filter-out %check, $(filter install%,$(MAKECMDGOALS))) ifneq (,$(_is-dist-target)$(_is-install-target)) _curr-ver := $(shell cd $(srcdir) \ && $(_build-aux)/git-version-gen .tarball-version)