bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] Portability fix for GNU make 3.79.1.


From: Ralf Wildenhues
Subject: [PATCH] Portability fix for GNU make 3.79.1.
Date: Sat, 2 Aug 2008 10:23:16 +0200
User-agent: Mutt/1.5.18 (2008-05-17)

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

OK to apply?

Thanks,
Ralf

 top/GNUmakefile |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/top/GNUmakefile b/top/GNUmakefile
index ea5e72c..8b64c49 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
-- 
1.5.5.40.g4cdda





reply via email to

[Prev in Thread] Current Thread [Next in Thread]