DAQ_SETTINGS → st.cmd permissions, linux-arm, EPICS_BASE

diff --git a/DAQ_SETTINGS/configure/RELEASE b/DAQ_SETTINGS/configure/RELEASE
index ac52b523b39b12d2fe56185163f7910400fe23e6..b11d1632dd2b7bcfc7b20ce99b95b217c4d44d68 100644 (file)
--- 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 021368d281907aa5d6fbe543c9480c04b54958fb..832a6d6ff6922370e31f761d53ef55c19049293e 100755 (executable)
--- 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