From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 2 Aug 2008 08:23:16 +0000 (+0200)
Subject: Portability fix for GNU make 3.79.1.
X-Git-Tag: v0.1~7173
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=837e2dc24dd3f7d0af45714f4b660c5ce57becec;p=gnulib.git

Portability fix for GNU make 3.79.1.

* top/GNUmakefile: Avoid 'else COND', which older GNU make
versions do not understand.
---

diff --git a/ChangeLog b/ChangeLog
index 0abbf055a..e5bbf4588 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Portability fix for GNU make 3.79.1.
+	* top/GNUmakefile: Avoid 'else COND', which older GNU make
+	versions do not understand.
+
 2008-08-01  Bruno Haible  <bruno@clisp.org>
 
 	Work around bug of HP-UX 10.20 cc with -0.0 literal.
diff --git a/top/GNUmakefile b/top/GNUmakefile
index ea5e72c44..8b64c49dd 100644
--- a/top/GNUmakefile
+++ b/top/GNUmakefile
@@ -62,19 +62,21 @@ ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL))
     ifneq ($(_curr-ver),$(VERSION))
       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))
+	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