From 2135e4f8d7842153d36e0e3a8be03d968ee2767f Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Wed, 14 Oct 2015 11:38:45 +0200
Subject: [PATCH] have EPICS version dependent flags and fix in record
detection
---
App/tools/driver.makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/App/tools/driver.makefile b/App/tools/driver.makefile
index 4c322e5e..bbdf6a9f 100644
--- a/App/tools/driver.makefile
+++ b/App/tools/driver.makefile
@@ -305,7 +305,7 @@ DBD_SRCS += ${DBDS_${EPICSVERSION}}
export DBD_SRCS
RECORDS1 = $(patsubst %Record.dbd, %, $(filter-out dev%, $(filter %Record.dbd, $(notdir ${DBD_SRCS}))))
-RECORDS2 = $(shell ${MAKEHOME}/expandDBD.tcl -r $(addprefix -I, $(sort $(dir ${DBD_SRCS}))) $(realpath ${DBDS}))
+#RECORDS2 = $(shell ${MAKEHOME}/expandDBD.tcl -r $(addprefix -I, $(sort $(dir ${DBD_SRCS}))) $(realpath ${DBDS}))
RECORDS = $(sort ${RECORDS1} ${RECORDS2})
export RECORDS
@@ -427,11 +427,11 @@ O.%:
$(MKDIR) $@
ifeq ($(shell echo "${LIBVERSION}" | grep -v -E "^[0-9]+\.[0-9]+\.[0-9]+\$$"),)
-install::
+install:: build
@test ! -d ${MODULE_LOCATION}/R${EPICSVERSION}/lib/${T_A} || \
(echo -e "Error: ${MODULE_LOCATION}/R${EPICSVERSION}/lib/${T_A} already exists.\nNote: If you really want to overwrite then uninstall first."; false)
else
-install::
+install:: build
@test ! -d ${MODULE_LOCATION}/R${EPICSVERSION}/lib/${T_A} || \
(echo -e "Warning: Re-installing ${MODULE_LOCATION}/R${EPICSVERSION}/lib/${T_A}"; \
rm -rf ${MODULE_LOCATION}/R${EPICSVERSION}/lib/${T_A})
@@ -448,7 +448,7 @@ export REQ
else # in O.*
## RUN 4
# in O.* directory
-$(foreach v, USR_INCLUDES USR_CFLAGS USR_CXXFLAGS USR_CPPFLAGS, $(eval $v+=$${$v_${OS_CLASS}} $${$v_${T_A}}))
+$(foreach v, USR_INCLUDES USR_CFLAGS USR_CXXFLAGS USR_CPPFLAGS, $(eval $v+=$${$v_${OS_CLASS}} $${$v_${T_A}} $${$v_${EPICS_BASETYPE}} $${$v_${EPICSVERSION}}))
CFLAGS += ${EXTRA_CFLAGS}
MODULEDBD=${if $(strip ${DBDFILES}),${PRJ}.dbd}
--
GitLab