epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Added ifneq test around -include lines for make version 3.80 on Linux FC4.

Browse Source 
See Ernest Williams for details.
This commit is contained in:
Janet B. Anderson
2008-03-28 19:28:13 +00:00
parent 1d1454ba98
commit a4a2a73fe7
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure/RULES_BUILD
View File

@@ -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)) ))

8
configure/RULES_TOP
View File

@@ -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