From b7381dc8a9650d65bce71d012bd85bc9179c70a5 Mon Sep 17 00:00:00 2001 From: Philipp Klaus Date: Tue, 20 Aug 2019 17:33:13 +0200 Subject: [PATCH] =?utf8?q?DAQ=5FSETTINGS=20=E2=86=92=20st.cmd=20permission?= =?utf8?q?s,=20linux-arm,=20EPICS=5FBASE?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- DAQ_SETTINGS/configure/RELEASE | 8 ++++++-- DAQ_SETTINGS/iocBoot/iocDAQ_SETTINGS/st.cmd | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/DAQ_SETTINGS/configure/RELEASE b/DAQ_SETTINGS/configure/RELEASE index ac52b52..b11d163 100644 --- a/DAQ_SETTINGS/configure/RELEASE +++ b/DAQ_SETTINGS/configure/RELEASE @@ -28,8 +28,12 @@ # If using the sequencer, point SNCSEQ at its top directory: #SNCSEQ = $(MODULES)/seq-ver -# EPICS_BASE should appear last so earlier modules can override stuff: -EPICS_BASE = /Users/pklaus/local_software/EPICS/base +EPICS_BASE = $(EPICS_ROOT)/base + +# EPICS_ROOT is an absolute path here. If you need a different one, you don't +# need to change it here, you can specify the right when when using make: +# make EPICS_ROOT=/your/override/here +EPICS_ROOT=/home/scs/EPICS/EPICS # Set RULES here if you want to use build rules from somewhere # other than EPICS_BASE: diff --git a/DAQ_SETTINGS/iocBoot/iocDAQ_SETTINGS/st.cmd b/DAQ_SETTINGS/iocBoot/iocDAQ_SETTINGS/st.cmd index 021368d..832a6d6 100755 --- a/DAQ_SETTINGS/iocBoot/iocDAQ_SETTINGS/st.cmd +++ b/DAQ_SETTINGS/iocBoot/iocDAQ_SETTINGS/st.cmd @@ -1,4 +1,4 @@ -#!../../bin/darwin-x86/DAQ_SETTINGS +#!../../bin/linux-arm/DAQ_SETTINGS #- You may have to change DAQ_SETTINGS to something else #- everywhere it appears in this file -- 2.43.0