From a4a2a73fe75b8abbabe725b45409881682d25e40 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Fri, 28 Mar 2008 19:28:13 +0000
Subject: [PATCH] Added ifneq test around -include lines for make version 3.80
 on Linux FC4. See Ernest Williams for details.

---
 configure/RULES_BUILD | 8 ++++++--
 configure/RULES_TOP   | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index 5d737f968..986ca6e04 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -112,7 +112,9 @@ RULES_TOP:=$(INSTALL_LOCATION)
 ifneq ($(CONFIG),$(TOP)/configure)
 -include $(TOP)/configure/RULES_BUILD
 endif
--include $(wildcard $(strip $(RULES_TOP))/cfg/RULES*)
+ifneq ($(wildcard $(RULES_TOP)/cfg/RULES*),)
+-include $(wildcard $(RULES_TOP)/cfg/RULES*)
+endif
 
 # Include RULES* files from tops defined in RELEASE* files
 ifneq ($(RELEASE_TOPS),)
@@ -121,7 +123,9 @@ define  TOP_RULES_template
   ifneq ($$(CONFIG),$$($(1))/configure)
     -include $$(strip $$($(1)))/configure/RULES_BUILD
   endif
-  -include $$(wildcard $$(strip $($(1)))/cfg/RULES*)
+  ifneq ($$(wildcard $$($(1))/cfg/RULES*),)
+  -include $$(wildcard $$($(1))/cfg/RULES*)
+  endif
 endef
 $(foreach top, $(RELEASE_TOPS), \
        $(eval $(call TOP_RULES_template,$(top)) ))
diff --git a/configure/RULES_TOP b/configure/RULES_TOP
index fa5333f94..33bd94e99 100644
--- a/configure/RULES_TOP
+++ b/configure/RULES_TOP
@@ -19,7 +19,9 @@ VALID_BUILDS += Host
 
 # Include RULES* files from current top
 RULES_TOP:=$(INSTALL_LOCATION)
--include $(wildcard $(strip $(RULES_TOP))/cfg/RULES*)
+ifneq ($(wildcard $(RULES_TOP)/cfg/RULES*),)
+-include $(wildcard $(RULES_TOP)/cfg/RULES*)
+endif
 -include $(wildcard $(CONFIG)/RULES_OCTAVE)
 
 RELEASE_TOPS = $(shell $(CONVERTRELEASE) -T $(TOP) -h $(EPICS_HOST_ARCH) STDOUT )
@@ -28,7 +30,9 @@ RELEASE_TOPS = $(shell $(CONVERTRELEASE) -T $(TOP) -h $(EPICS_HOST_ARCH) STDOUT
 ifneq ($(RELEASE_TOPS),)
 define TOP_RULES_template
   RULES_TOP:=$$($(1))
-  -include $$(wildcard $$(strip $($(1)))/cfg/RULES*)
+  ifneq ($$(wildcard $$($(1))/cfg/RULES*),)
+  -include $$(wildcard $$($(1))/cfg/RULES*)
+  endif
 endef
 $(foreach top, $(RELEASE_TOPS), $(eval $(call TOP_RULES_template,$(top)) ))
 endif