From c0a6adb5160b13bda594c8a68123e50c3dcc1fe6 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Wed, 29 Mar 2006 17:08:23 +0000
Subject: [PATCH] Renamed CONFIG_EXTENSIONS to CONFIG_SITE. Moved includes to
 CONFIG. Moved INSTALL_LOCATION definition.

---
 src/makeBaseExt/top/configure/CONFIG          | 41 +++++++++++++++++--
 .../top/configure/CONFIG_EXTENSIONS           | 36 ----------------
 src/makeBaseExt/top/configure/CONFIG_SITE     | 12 ++++++
 src/makeBaseExt/top/configure/RELEASE         |  4 +-
 4 files changed, 50 insertions(+), 43 deletions(-)
 delete mode 100644 src/makeBaseExt/top/configure/CONFIG_EXTENSIONS
 create mode 100644 src/makeBaseExt/top/configure/CONFIG_SITE

diff --git a/src/makeBaseExt/top/configure/CONFIG b/src/makeBaseExt/top/configure/CONFIG
index 8d2db3248..49ac5ecc3 100644
--- a/src/makeBaseExt/top/configure/CONFIG
+++ b/src/makeBaseExt/top/configure/CONFIG
@@ -1,8 +1,41 @@
 # $Id$
 
-include $(TOP)/configure/CONFIG_EXTENSIONS
-# Add any changes to make rules here
+INSTALL_IDLFILE = $(INSTALL)
 
-#CROSS_COMPILER_TARGET_ARCHS =
-#SHARED_LIBRARIES = NO
+include $(TOP)/configure/RELEASE
+-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH)
+-include $(TOP)/configure/RELEASE.Common.$(T_A)
+-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
+
+CONFIG=$(EPICS_BASE)/configure
+include $(CONFIG)/CONFIG
+
+# Override for definition in base
+INSTALL_LOCATION = $(TOP)
+include $(TOP)/configure/CONFIG_SITE
+
+ifdef INSTALL_LOCATION_EXTENSIONS
+INSTALL_LOCATION = $(INSTALL_LOCATION_EXTENSIONS)
+endif
+
+#  Site specific host architecture definitions
+-include $(TOP)/configure/os/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
+
+ifdef T_A
+
+#  Site specific target architecture definitions
+-include $(TOP)/configure/os/CONFIG_SITE.Common.$(T_A)
+
+#  Cross compile specific definitions
+ifneq ($(EPICS_HOST_ARCH),$(T_A))
+-include $(TOP)/configure/CONFIG.CrossCommon
+endif
+
+#  Site specific host-target combination definitions
+-include $(TOP)/configure/os/CONFIG.$(EPICS_HOST_ARCH).$(T_A)
+-include $(TOP)/configure/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+
+-include $(TOP)/configure/O.$(T_A)/CONFIG_APP_INCLUDE
+
+endif
 
diff --git a/src/makeBaseExt/top/configure/CONFIG_EXTENSIONS b/src/makeBaseExt/top/configure/CONFIG_EXTENSIONS
deleted file mode 100644
index 85dec9267..000000000
--- a/src/makeBaseExt/top/configure/CONFIG_EXTENSIONS
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-
-INSTALL_IDLFILE = $(INSTALL)
-
-include $(TOP)/configure/RELEASE
--include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH)
-
-CONFIG=$(EPICS_BASE)/configure
-include $(CONFIG)/CONFIG
-
-INSTALL_LOCATION = $(TOP)
-ifdef INSTALL_LOCATION_EXTENSIONS
-INSTALL_LOCATION = $(INSTALL_LOCATION_EXTENSIONS)
-endif
-
-#  Site specific host architecture definitions
--include $(TOP)/configure/os/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
-
-ifdef T_A
-
-#  Site specific target architecture definitions
--include $(TOP)/configure/os/CONFIG_SITE.Common.$(T_A)
-
-#  Cross compile specific definitions
-ifneq ($(EPICS_HOST_ARCH),$(T_A))
--include $(TOP)/configure/CONFIG.CrossCommon
-endif
-
-#  Site specific host-target combination definitions
--include $(TOP)/configure/os/CONFIG.$(EPICS_HOST_ARCH).$(T_A)
--include $(TOP)/configure/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
-
--include $(TOP)/configure/O.$(T_A)/CONFIG_APP_INCLUDE
-
-endif
-
diff --git a/src/makeBaseExt/top/configure/CONFIG_SITE b/src/makeBaseExt/top/configure/CONFIG_SITE
new file mode 100644
index 000000000..5c833356c
--- /dev/null
+++ b/src/makeBaseExt/top/configure/CONFIG_SITE
@@ -0,0 +1,12 @@
+# $Id$
+
+# Make any extensions-specific changes to the EPICS build
+# configuration variables in this file.
+
+# Extensions should not normally be built for cross targets
+CROSS_COMPILER_TARGET_ARCHS =
+
+# If you don't want to install into $(TOP) then
+# define INSTALL_LOCATION here
+#INSTALL_LOCATION=<fullpathname>
+
diff --git a/src/makeBaseExt/top/configure/RELEASE b/src/makeBaseExt/top/configure/RELEASE
index 0a3074fbc..3f8a62fdb 100644
--- a/src/makeBaseExt/top/configure/RELEASE
+++ b/src/makeBaseExt/top/configure/RELEASE
@@ -1,8 +1,6 @@
 # $Id$
 
-# If you don't want to install into $(TOP) dir then
-# define INSTALL_LOCATION_EXTENSIONS here
-#INSTALL_LOCATION_EXTENSIONS=<fullpathname>
+# Define INSTALL_LOCATION in CONFIG_SITE
 
 # Location of external products
 EPICS_BASE=_EPICS_BASE_