X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=top%2FGNUmakefile;h=4b4cf15cf716562d2a246b5416d6c42cbe5fa572;hb=b729ee98921bac8c8687a4d1a941aa0567f8196e;hp=8b64c49dd918a34b4d6f451ec5bbc436d8fd51bd;hpb=837e2dc24dd3f7d0af45714f4b660c5ce57becec;p=gnulib.git

diff --git a/top/GNUmakefile b/top/GNUmakefile
index 8b64c49dd..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)
@@ -63,20 +63,20 @@ ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL))
       ifeq ($(_curr-ver),UNKNOWN)
         $(info WARNING: unable to verify if $(VERSION) is correct version)
       else
-	ifneq (,$(_is-install-target))
-	  # GNU Coding Standards state that 'make install' should not cause
-	  # 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
-	  # 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'.
-	  $(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 \
-	    && $(_autoreconf))
-	endif
+        ifneq (,$(_is-install-target))
+          # GNU Coding Standards state that 'make install' should not cause
+          # 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
+          # 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'.
+          $(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 \
+            && $(_autoreconf))
+        endif
       endif
     endif
   endif