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 3aa2263..409ae14 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-26  Jim Meyering  <meyering@redhat.com>
+
+       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  <bruno@clisp.org>
 
        Generate INSTALL file variants with prettier quotes.

diff --git a/top/GNUmakefile b/top/GNUmakefile
index 7635e8d..4b4cf15 100644 (file)
--- 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)