From 3fb737aea693a32c08efee2f3c5fd4e5de785b3f Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Mon, 15 Sep 2008 15:08:45 +0000
Subject: [PATCH] Moved includes for installed and RELEASE config files from
 RULES_TOP.

---
 configure/CONFIG | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/configure/CONFIG b/configure/CONFIG
index cc2c4606b..2b60482ed 100644
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -36,6 +36,7 @@ ifdef T_A
 endif
 
 include $(CONFIG)/CONFIG_COMMON
+include $(CONFIG)/CONFIG_FILE_TYPE
 
 #  Base-specific build options
 #
@@ -83,6 +84,25 @@ endif
 
 endif
 
+# Include <top>/cfg/CONFIG* definitions from tops defined in RELEASE* files
+#
+ifneq ($(CONFIG),$(TOP)/configure)
+RELEASE_TOPS ?= $(shell $(PERL) $(TOOLS)/convertRelease.pl -T $(TOP) releaseTops )
+RELEASE_CFG_CONFIGS = $(foreach top, $(RELEASE_TOPS), $(wildcard $($(top))/cfg/CONFIG*))
+ifneq ($(RELEASE_CFG_CONFIGS),)
+include $(RELEASE_CFG_CONFIGS)
+endif
+endif
+
+# Include $(INSTALL_CFG)/CONFIG* definitions
+#
+ifndef T_A
+TOP_CFG_CONFIGS = $(wildcard $(INSTALL_CFG)/CONFIG*)
+ifneq ($(TOP_CFG_CONFIGS),)
+include $(TOP_CFG_CONFIGS)
+endif
+endif
+
 #  User specific definitions
 #
 -include $(HOME)/configure/CONFIG_USER