From 3a182a9eea4cadc3af9bff7cb8d7c534c60f250f Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@anl.gov>
Date: Tue, 8 Feb 2022 14:18:13 -0600
Subject: [PATCH] "Quote" exe program paths for Windows

Clean up old EPICS_DATABASE var's (pre-7.0?)
---
 configure/CONFIG_DATABASE_MODULE   | 24 +++++++++---------------
 configure/CONFIG_LIBCOM_MODULE     |  7 ++++---
 modules/database/src/ioc/bpt/RULES |  5 +++--
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/configure/CONFIG_DATABASE_MODULE b/configure/CONFIG_DATABASE_MODULE
index 3376ff67c..0a5cf97d1 100644
--- a/configure/CONFIG_DATABASE_MODULE
+++ b/configure/CONFIG_DATABASE_MODULE
@@ -5,22 +5,16 @@
 # 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))
+# Our locally-built tools
+DBEXPAND                   = $(PERL) $(EPICS_BASE_HOST_BIN)/dbdExpand.pl
+DBTORECORDTYPEH            = $(PERL) $(EPICS_BASE_HOST_BIN)/dbdToRecordtypeH.pl
+DBTOMENUH                  = $(PERL) $(EPICS_BASE_HOST_BIN)/dbdToMenuH.pl
+DBDTOHTML                  = $(PERL) $(EPICS_BASE_HOST_BIN)/dbdToHtml.pl
+REGISTERRECORDDEVICEDRIVER = $(PERL) $(EPICS_BASE_HOST_BIN)/registerRecordDeviceDriver.pl
 
-  # 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)
+# Windows can need these paths to be quoted
+MAKEBPT = "$(EPICS_BASE_HOST_BIN)/makeBpt$(HOSTEXE)"
+MSI3_15 = "$(EPICS_BASE_HOST_BIN)/msi$(HOSTEXE)"
 
 # Libraries needed to link a basic IOC
 EPICS_BASE_IOC_LIBS = dbRecStd dbCore ca Com
diff --git a/configure/CONFIG_LIBCOM_MODULE b/configure/CONFIG_LIBCOM_MODULE
index 32bb937c2..428d17a8e 100644
--- a/configure/CONFIG_LIBCOM_MODULE
+++ b/configure/CONFIG_LIBCOM_MODULE
@@ -5,9 +5,10 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# Set location of locally generated tools
-YACC = $(abspath $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH))/antelope$(HOSTEXE)
-LEX = $(abspath $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH))/e_flex$(HOSTEXE) \
+# Our locally-built tools
+# Windows can need these paths to be quoted
+YACC = "$(EPICS_BASE_HOST_BIN)/antelope$(HOSTEXE)"
+LEX  = "$(EPICS_BASE_HOST_BIN)/e_flex$(HOSTEXE)" \
         -S$(EPICS_BASE)/include/flex.skel.static
 
 # Default stack size for osiThread
diff --git a/modules/database/src/ioc/bpt/RULES b/modules/database/src/ioc/bpt/RULES
index cf6232bc6..7239efd02 100644
--- a/modules/database/src/ioc/bpt/RULES
+++ b/modules/database/src/ioc/bpt/RULES
@@ -11,5 +11,6 @@
 
 # This is a Makefile fragment, see src/ioc/Makefile.
 
-$(patsubst %,$(COMMON_DIR)/%,$(BPT_DBD)) : \
-    $(COMMON_DIR)/bpt%.dbd : $(MAKEBPT)
+$(addprefix $(COMMON_DIR)/,$(BPT_DBD)) : $(COMMON_DIR)/bpt%.dbd : \
+    $(EPICS_BASE_HOST_BIN)/makeBpt$(HOSTEXE)
+# Don't try to use $(MAKEBPT) above