From d5be5ed5134aaac6cdb41bca16153598ba6793da Mon Sep 17 00:00:00 2001
From: Ron Sluiter <rsluiter@users.noreply.github.com>
Date: Tue, 30 Apr 2013 14:32:44 +0000
Subject: [PATCH] Updated files based on EPICS baseR3.14.12.3

---
 configure/CONFIG      | 23 +++++++++++------------
 configure/CONFIG_SITE | 39 +++++++++++++++++++++------------------
 configure/Makefile    |  9 ---------
 configure/RELEASE     | 11 ++++++-----
 4 files changed, 38 insertions(+), 44 deletions(-)

diff --git a/configure/CONFIG b/configure/CONFIG
index ae1e38dc..c1a47032 100644
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -1,30 +1,29 @@
-# CONFIG
+# CONFIG - Load build configuration data
+#
+# Do not make changes to this file!
 
-# You might want to change this to some shared set of rules, e.g.
-# RULES=/path/to/epics/support/modules/rules/x-y
-RULES=$(EPICS_BASE)
+# Allow user to override where the build rules come from
+RULES = $(EPICS_BASE)
 
+# 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
 
-CONFIG=$(RULES)/configure
+CONFIG = $(RULES)/configure
 include $(CONFIG)/CONFIG
 
-# Override for definition in base
+# Override the Base definition:
 INSTALL_LOCATION = $(TOP)
-include $(TOP)/configure/CONFIG_SITE
--include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH)
--include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
 
+# CONFIG_SITE files contain other build configuration settings
+include $(TOP)/configure/CONFIG_SITE
+-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)
-
- -include $(TOP)/configure/O.$(T_A)/CONFIG_APP_INCLUDE
 endif
 
diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index 88366c5a..72b399d4 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -1,30 +1,33 @@
 # CONFIG_SITE
 
 # Make any application-specific changes to the EPICS build
-# configuration variables in this file.
+#   configuration variables in this file.
 #
 # Host/target specific settings can be specified in files named
-#  CONFIG_SITE.$(EPICS_HOST_ARCH).Common
-#  CONFIG_SITE.Common.$(T_A)
-#  CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+#   CONFIG_SITE.$(EPICS_HOST_ARCH).Common
+#   CONFIG_SITE.Common.$(T_A)
+#   CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
 
-#ifeq ($(EPICS_HOST_ARCH),vl-linux-x86)
-#CROSS_COMPILER_TARGET_ARCHS = RTEMS-uC5282
-#endif
+# CHECK_RELEASE controls the consistency checking of the support
+#   applications pointed to by the RELEASE* files.
+# Normally CHECK_RELEASE should be set to YES.
+# Set CHECK_RELEASE to NO to disable checking completely.
+# Set CHECK_RELEASE to WARN to perform consistency checking but
+#   continue building anyway if conflicts are found.
+CHECK_RELEASE = YES
 
 # Set this when you only want to compile this application
-# for a subset of the cross-compiled target architectures
-# that Base is built for.
+#   for a subset of the cross-compiled target architectures
+#   that Base is built for.
 #CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
 
+# To install files into a location other than $(TOP) define
+#   INSTALL_LOCATION here.
+#INSTALL_LOCATION=</path/name/to/install/top>
+
 # Set this when your IOC and the host use different paths
-# to access the application. This will be needed to boot
-# from a Microsoft FTP server or with some NFS mounts.
+#   to access the application. This will be needed to boot
+#   from a Microsoft FTP server or with some NFS mounts.
 # You must rebuild in the iocBoot directory for this to
-# take effect.
-#IOCS_APPL_TOP = <path to application top as seen by IOC>
-
-# If you don't want to install into $(TOP) then
-# define INSTALL_LOCATION here
-#INSTALL_LOCATION=<fullpathname>
-
+#   take effect.
+#IOCS_APPL_TOP = </IOC/path/to/application/top>
diff --git a/configure/Makefile b/configure/Makefile
index ade29a7e..92543094 100644
--- a/configure/Makefile
+++ b/configure/Makefile
@@ -2,16 +2,7 @@ TOP=..
 
 include $(TOP)/configure/CONFIG
 
-# CHECK_RELEASE controls the consistency checking of the support
-# applications defined in the $(TOP)/configure/RELEASE* files.
-# Normally CHECK_RELEASE should be set to YES.
-# Set CHECK_RELEASE to NO to disable checking completely.
-# Set CHECK_RELEASE to WARN to perform consistency checking,
-# but continue the build even if conflicts are found.
-CHECK_RELEASE = YES
-
 TARGETS = $(CONFIG_TARGETS)
 CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS)))
 
 include $(TOP)/configure/RULES
-
diff --git a/configure/RELEASE b/configure/RELEASE
index 59936847..6235f85d 100644
--- a/configure/RELEASE
+++ b/configure/RELEASE
@@ -14,13 +14,14 @@ SUPPORT=
 
 # If any motor controller communication mechanism besides the VME backplane is
 # required, then ASYN must be defined.
-# Recommended ASYN release: R4-18
-ASYN=$(SUPPORT)/asyn/R4-18
+# Recommended ASYN release: R4-21
+ASYN=$(SUPPORT)/asyn/R4-21
 
 # Need the sequencer and the bust record for the MM4005 and XPS trajectory scanning
-# Recommended SNCSEQ release: R2-1-13
-SNCSEQ=$(SUPPORT)/seq/2-1-3
-BUSY=$(SUPPORT)/busy/R1-4
+# Recommended SNCSEQ release: R2-1-12
+SNCSEQ=$(SUPPORT)/seq/2-1-12
+# Recommended BUSY release: R1-5
+BUSY=$(SUPPORT)/busy/R1-5
 
 # Recommended EPICS release: R3.14.12.1
 EPICS_BASE=