From 56b6644b878cff4b9d7c2218167d94af84e02ec0 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Tue, 14 Nov 2017 23:34:25 -0600
Subject: [PATCH] Export tool configurations as cfg/CONFIG_* files

---
 configure/CONFIG                 | 18 ++----------------
 configure/CONFIG_DATABASE_MODULE | 26 ++++++++++++++++++++++++++
 configure/Makefile               |  9 ++++++++-
 3 files changed, 36 insertions(+), 17 deletions(-)
 create mode 100644 configure/CONFIG_DATABASE_MODULE

diff --git a/configure/CONFIG b/configure/CONFIG
index f39eed607..9ebdbeb20 100644
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -13,9 +13,10 @@ ifdef T_A
 -include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
 endif
 
+BUILDING_DATABASE = DEFINED
+
 CONFIG = $(RULES)/configure
 include $(CONFIG)/CONFIG
-include $(TOP)/configure/CONFIG_DATABASE_VERSION
 
 # Override the Base definition:
 INSTALL_LOCATION = $(TOP)
@@ -26,21 +27,6 @@ BASE_CPPFLAGS += -DUSE_TYPED_RSET
 # Shared library ABI version.
 SHRLIB_VERSION = 3.17.0
 
-# Set path for local tools
-MAKEBPT                    = $(INSTALL_HOST_BIN)/makeBpt$(HOSTEXE)
-DBEXPAND                   = $(PERL) $(INSTALL_HOST_BIN)/dbdExpand.pl
-DBTORECORDTYPEH            = $(PERL) $(INSTALL_HOST_BIN)/dbdToRecordtypeH.pl
-DBTOMENUH                  = $(PERL) $(INSTALL_HOST_BIN)/dbdToMenuH.pl
-DBDTOHTML                  = $(PERL) $(INSTALL_HOST_BIN)/dbdToHtml.pl
-REGISTERRECORDDEVICEDRIVER = $(PERL) $(INSTALL_HOST_BIN)/registerRecordDeviceDriver.pl
-MSI3_15                    = $(INSTALL_HOST_BIN)/msi$(HOSTEXE)
-
-# Set path for tools from libcom for unbundled build
-ifdef EPICS_LIBCOM
-EYACC = $(abspath $(EPICS_LIBCOM_HOST_BIN))/antelope$(HOSTEXE)
-ELEX = $(abspath $(EPICS_LIBCOM_HOST_BIN))/e_flex$(HOSTEXE) -S$(EPICS_LIBCOM)/include/flex.skel.static
-endif
-
 # CONFIG_SITE files contain other build configuration settings
 include $(TOP)/configure/CONFIG_SITE
 -include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
diff --git a/configure/CONFIG_DATABASE_MODULE b/configure/CONFIG_DATABASE_MODULE
new file mode 100644
index 000000000..1ef9b475b
--- /dev/null
+++ b/configure/CONFIG_DATABASE_MODULE
@@ -0,0 +1,26 @@
+#*************************************************************************
+# Copyright (c) 2017 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
+#*************************************************************************
+
+# Set EPICS_DATABASE if necessary
+ifndef EPICS_DATABASE
+  EPICS_DATABASE = $(if $(BUILDING_DATABASE),$(INSTALL_LOCATION),$(EPICS_BASE))
+
+  # Paths to tools built here
+  EPICS_DATABASE_HOST_BIN = $(EPICS_DATABASE)/bin/$(EPICS_HOST_ARCH)
+endif
+
+# Set location of locally-built tools
+MAKEBPT                    = $(EPICS_DATABASE_HOST_BIN)/makeBpt$(HOSTEXE)
+DBEXPAND                   = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdExpand.pl
+DBTORECORDTYPEH            = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdToRecordtypeH.pl
+DBTOMENUH                  = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdToMenuH.pl
+DBDTOHTML                  = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdToHtml.pl
+REGISTERRECORDDEVICEDRIVER = $(PERL) $(EPICS_DATABASE_HOST_BIN)/registerRecordDeviceDriver.pl
+MSI3_15                    = $(EPICS_DATABASE_HOST_BIN)/msi$(HOSTEXE)
+
+# Libraries needed to link a basic IOC
+EPICS_BASE_IOC_LIBS = dbRecStd dbCore ca Com
diff --git a/configure/Makefile b/configure/Makefile
index 925430940..dd292091c 100644
--- a/configure/Makefile
+++ b/configure/Makefile
@@ -1,8 +1,15 @@
-TOP=..
+#*************************************************************************
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
+#*************************************************************************
+TOP = ..
 
 include $(TOP)/configure/CONFIG
 
 TARGETS = $(CONFIG_TARGETS)
 CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS)))
 
+CFG += CONFIG_DATABASE_MODULE
+CFG += CONFIG_DATABASE_VERSION
+
 include $(TOP)/configure/RULES