From 81a219f91aa68ca6a05cdad724dc311326809d3d Mon Sep 17 00:00:00 2001
From: rivers <rivers@dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b>
Date: Mon, 25 Jul 2011 17:48:33 +0000
Subject: [PATCH] New version from 3.14.12.1 (with fix); move some things into
 new CONFIG_SITE

git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@13234 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
---
 configure/CONFIG | 49 ++++++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/configure/CONFIG b/configure/CONFIG
index d27307d..156a084 100755
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -1,26 +1,31 @@
-#CONFIG
-include $(TOP)/configure/CONFIG_APP
-# Add any changes to make definitions here
+# CONFIG - Load build configuration data
+#
+# Do not make changes to this file!
 
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
+# Allow user to override where the build rules come from
+RULES = $(EPICS_BASE)
 
-# Use this when your IOC and the host use different paths
-# to access the application. Typically this will be 
-# used with the Microsoft FTP server or with NFS mounts. Use
-# is indicated by failure of the cdCommands script on
-# vxWorks. You must rebuild in the iocBoot directory 
-# before this takes effect.
-#IOCS_APPL_TOP = <the top of the application as seen by the IOC>
+# RELEASE files point to other application tops
+include $(TOP)/configure/RELEASE
+-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH)
+-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).Common
+ifdef T_A
+-include $(TOP)/configure/RELEASE.Common.$(T_A)
+-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
+endif
 
-# We don't set STATIC_BUILD for WIN32 or Cygwin, use base to configure
-ifeq (Darwin, $(OS_CLASS))
-  STATIC_BUILD=NO
-endif
-ifeq (Linux, $(OS_CLASS))
-  STATIC_BUILD=YES
-  SHARED_LIBRARIES=NO
-endif
-ifeq (solaris, $(OS_CLASS))
-  STATIC_BUILD=YES
-  SHARED_LIBRARIES=NO
+CONFIG = $(RULES)/configure
+include $(CONFIG)/CONFIG
+
+# Override the Base definition:
+INSTALL_LOCATION = $(TOP)
+
+# CONFIG_SITE files contain other build configuration settings
+include $(TOP)/configure/CONFIG_SITE
+-include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH)
+-include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
+ifdef T_A
+ -include $(TOP)/configure/CONFIG_SITE.Common.$(T_A)
+ -include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
 endif
+