From 3b469fec5883f90282e1bd6dc6c0723879e4711a Mon Sep 17 00:00:00 2001
From: Ralph Lange <ralph.lange@gmx.de>
Date: Fri, 21 Jul 2017 13:27:20 +0200
Subject: [PATCH] Change paths for tools from this module

---
 configure/CONFIG   | 17 +++++++++++++++--
 src/ioc/bpt/RULES  |  3 +--
 src/ioc/db/RULES   |  2 +-
 src/std/rec/RULES  |  2 +-
 src/tools/Makefile |  3 ---
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/configure/CONFIG b/configure/CONFIG
index 8e6054d92..a34b10e1a 100644
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -19,9 +19,22 @@ include $(CONFIG)/CONFIG
 # Override the Base definition:
 INSTALL_LOCATION = $(TOP)
 
+# Use new RSET definition
 BASE_CPPFLAGS += -DUSE_TYPED_RSET
-# makeBpt is created locally
-MAKEBPT = $(INSTALL_HOST_BIN)/makeBpt$(HOSTEXE)
+
+# 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
+
+# Set path for tools from libcom for unbundled build
+ifdef EPICS_LIBCOM
+EYACC = $(EPICS_LIBCOM_HOST_BIN)/antelope$(HOSTEXE)
+ELEX = $(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
diff --git a/src/ioc/bpt/RULES b/src/ioc/bpt/RULES
index a434eb342..cf6232bc6 100644
--- a/src/ioc/bpt/RULES
+++ b/src/ioc/bpt/RULES
@@ -12,5 +12,4 @@
 # This is a Makefile fragment, see src/ioc/Makefile.
 
 $(patsubst %,$(COMMON_DIR)/%,$(BPT_DBD)) : \
-    $(COMMON_DIR)/bpt%.dbd : $(EPICS_BASE_HOST_BIN)/makeBpt$(HOSTEXE)
-
+    $(COMMON_DIR)/bpt%.dbd : $(MAKEBPT)
diff --git a/src/ioc/db/RULES b/src/ioc/db/RULES
index 41b07f5af..5f11a4cc6 100644
--- a/src/ioc/db/RULES
+++ b/src/ioc/db/RULES
@@ -24,4 +24,4 @@ $(COMMON_DIR)/menuGlobal.dbd: $(IOCDIR)/db/Makefile $(IOCDIR)/db/RULES
 
 # This is a target-specific variable
 $(COMMON_DIR)/menuGlobal.dbd: DBDCAT_COMMAND = \
-    $(PERL) $(TOOLS)/makeIncludeDbd.pl $(menuGlobal_DBD) $(@F)
+    $(PERL) $(INSTALL_HOST_BIN)/makeIncludeDbd.pl $(menuGlobal_DBD) $(@F)
diff --git a/src/std/rec/RULES b/src/std/rec/RULES
index 81e9a8c1d..868fc1d40 100644
--- a/src/std/rec/RULES
+++ b/src/std/rec/RULES
@@ -15,4 +15,4 @@ $(COMMON_DIR)/stdRecords.dbd: $(STDDIR)/rec/Makefile $(STDDIR)/rec/RULES
 
 # This is a target-specific variable
 $(COMMON_DIR)/stdRecords.dbd: DBDCAT_COMMAND = \
-    $(PERL) $(TOOLS)/makeIncludeDbd.pl $(stdRecords_DBD) $(@F)
+    $(PERL) $(INSTALL_HOST_BIN)/makeIncludeDbd.pl $(stdRecords_DBD) $(@F)
diff --git a/src/tools/Makefile b/src/tools/Makefile
index cba84fcb9..ccfd12dc8 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -8,9 +8,6 @@ TOP=../..
 
 include $(TOP)/configure/CONFIG
 
-# Bootstrap resolution: tools not installed yet
-TOOLS = $(TOP)/src/tools
-
 PERL_MODULES += DBD.pm
 PERL_MODULES += DBD/Base.pm
 PERL_MODULES += DBD/Breaktable.pm