From 716dabdba165fb0f89c50c54f07537383ef0c1d6 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Mon, 24 Mar 2008 22:02:29 +0000
Subject: [PATCH] Replaced O.<T_A> files CONFIG_APP_INCLUDE and RULES_INCLUDE
 creation with defs and rules in configure files CONFIG_APP_INCLUDE and
 RULES_BUILD

---
 configure/CONFIG             |  8 ++++++--
 configure/CONFIG_APP_INCLUDE | 23 +++++++++++++++++++++++
 configure/RULES.Db           |  2 +-
 3 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 configure/CONFIG_APP_INCLUDE

diff --git a/configure/CONFIG b/configure/CONFIG
index 9176112b4..8c07c1e60 100644
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -56,8 +56,6 @@ include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).Common
 
 ifdef T_A
 
--include $(CONFIG)/O.$(T_A)/CONFIG_APP_INCLUDE
-
 #  Cross compile specific definitions
 #
 ifneq ($(EPICS_HOST_ARCH),$(T_A))
@@ -72,6 +70,12 @@ endif
 #
 -include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).$(T_A)
 
+#  RELEASE file specific definitions
+#
+ifneq ($(CONFIG),$(TOP)/configure)
+-include $(CONFIG)/CONFIG_APP_INCLUDE
+endif
+
 #  Site specific target and host-target definitions
 #
 -include $(CONFIG)/os/CONFIG_SITE.Common.$(T_A)
diff --git a/configure/CONFIG_APP_INCLUDE b/configure/CONFIG_APP_INCLUDE
new file mode 100644
index 000000000..69f1ab9e6
--- /dev/null
+++ b/configure/CONFIG_APP_INCLUDE
@@ -0,0 +1,23 @@
+export TOP
+export IOCAPPS
+
+RELEASE_TOPS = $(shell $(PERL) $(TOOLS)/convertRelease.pl -T $(TOP) -h $(EPICS_HOST_ARCH) STDOUT )
+
+ifneq ($(RELEASE_TOPS),)
+
+define  RELEASE_FLAGS_template
+  export $(1)
+  $(1)_HOST_BIN = $$(strip $$($(1)))/bin/$(EPICS_HOST_ARCH)
+  $(1)_HOST_LIB = $$(strip $$($(1)))/lib/$(EPICS_HOST_ARCH)
+  $(1)_BIN = $$(strip $$($(1)))/bin/$(T_A)
+  $(1)_LIB = $$(strip $$($(1)))/lib/$(T_A)
+  SHRLIB_SEARCH_DIRS += $$($(1)_LIB)
+  RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include/os/$$(OS_CLASS)))
+  RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include))
+  RELEASE_DBDFLAGS += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/dbd))
+  RELEASE_PERL_MODULE_DIRS += $$(wildcard $$($(1)_LIB)/perl)
+endef
+$(foreach top, $(RELEASE_TOPS), $(eval $(call RELEASE_FLAGS_template,$(top)) ))
+
+endif
+
diff --git a/configure/RULES.Db b/configure/RULES.Db
index 114644842..2ebf879d8 100644
--- a/configure/RULES.Db
+++ b/configure/RULES.Db
@@ -108,7 +108,7 @@ COMMON_DBDS = $(DBD)
 COMMON_DBS = $(DB)
 COMMONS = $(DBD) $(DB)
 
--include $(TOP)/configure/O.$(EPICS_HOST_ARCH)/CONFIG_APP_INCLUDE
+-include $(TOP)/configure/CONFIG_APP_INCLUDE
 
 all:    install