From 38cfae032ed038164e30504fd8dc05f03327754c Mon Sep 17 00:00:00 2001 From: thomasms Date: Mon, 22 Mar 2021 21:58:30 +0100 Subject: [PATCH] Example RELEASE.local files are incorrect, parenthesis needed instead of curly braces. This hopefully corrects the issue. --- ExampleRELEASE.local | 15 ++++++++------- MasterRELEASE.local | 17 +++++++++-------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/ExampleRELEASE.local b/ExampleRELEASE.local index c7cff19..9ccf1ee 100644 --- a/ExampleRELEASE.local +++ b/ExampleRELEASE.local @@ -5,12 +5,13 @@ EPICS7_DIR=/home/install/epics/base-7.0.4 -PVDATABASE=${EPICS7_DIR}/modules/database -PVACLIENT=${EPICS7_DIR}/modules/pvaClient -PVA2PVA=${EPICS7_DIR}/modules/pva2pva -PVACCESS=${EPICS7_DIR}/modules/pvAccess -NORMATIVETYPES=${EPICS7_DIR}modules/normativeTypes -PVDATA=${EPICS7_DIR}modules/pvData -EPICS_BASE=${EPICS7_DIR} +# Do not change these paths (or the order) +EPICS_BASE=$(EPICS7_DIR) +PVDATABASE=$(EPICS7_DIR)/modules/database +PVACLIENT=$(EPICS7_DIR)/modules/pvaClient +PVA2PVA=$(EPICS7_DIR)/modules/pva2pva +PVACCESS=$(EPICS7_DIR)/modules/pvAccess +NORMATIVETYPES=$(EPICS7_DIR)/modules/normativeTypes +PVDATA=$(EPICS7_DIR)/modules/pvData TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top diff --git a/MasterRELEASE.local b/MasterRELEASE.local index 77c45a1..4391f48 100644 --- a/MasterRELEASE.local +++ b/MasterRELEASE.local @@ -3,13 +3,14 @@ # Change the first line and also EPICS_BASE and also possibly EPICS_BASE # type make at top level EPICS7_DIR=/home/epics7 -PVDATABASE=${EPICS7_DIR}/modules/pvDatabaseCPP -PVACLIENT=${EPICS7_DIR}/modules/pvaClientCPP -PVA2PVA=${EPICS7_DIR}/modules/pva2pva -PVACCESS=${EPICS7_DIR}/modules/pvAccessCPP -NORMATIVETYPES=${EPICS7_DIR}/modules/normativeTypesCPP -PVDATA=${EPICS7_DIR}/modules/pvDataCPP -PVCOMMON=${EPICS7_DIR}/modules/pvCommonCPP -EPICS_BASE=${EPICS7_DIR}/epics-base + +EPICS_BASE=$(EPICS7_DIR)/epics-base +PVDATABASE=$(EPICS7_DIR)/modules/pvDatabaseCPP +PVACLIENT=$(EPICS7_DIR)/modules/pvaClientCPP +PVA2PVA=$(EPICS7_DIR)/modules/pva2pva +PVACCESS=$(EPICS7_DIR)/modules/pvAccessCPP +NORMATIVETYPES=$(EPICS7_DIR)/modules/normativeTypesCPP +PVDATA=$(EPICS7_DIR)/modules/pvDataCPP +PVCOMMON=$(EPICS7_DIR)/modules/pvCommonCPP TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top