diff --git a/iocs/example/configure/RELEASE b/iocs/example/configure/RELEASE index b21f2dd0..5840770b 100644 --- a/iocs/example/configure/RELEASE +++ b/iocs/example/configure/RELEASE @@ -1,7 +1,4 @@ -# This file was automatically generated on Fri 25 May 2018 08:06:10 BST from -# source: /home/hgv27681/R3.14.12.3/support/pmac/etc/makeIocs/lab.xml -# -# *** Please do not edit this file: edit the source file instead. *** +# The following definitions must be changed for each site # # Common prefixes SUPPORT = /dls_sw/prod/R3.14.12.3/support @@ -10,6 +7,7 @@ ASYN = $(SUPPORT)/asyn/4-31 BUSY = $(SUPPORT)/busy/1-6-1dls1 CALC = $(SUPPORT)/calc/3-1 MOTOR = $(SUPPORT)/motor/6-9dls14 -PMAC = /home/hgv27681/R3.14.12.3/support/pmac +PMAC = $(TOP)/../../ # EPICS Base appears last EPICS_BASE = /dls_sw/epics/R3.14.12.3/base +EPICS_EXTENSIONS = /dls_sw/epics/R3.14.12.3/extensions diff --git a/iocs/example/iocBoot/ioclab/Makefile b/iocs/example/iocBoot/ioclab/Makefile index 65a2c3ef..b0bcfc06 100644 --- a/iocs/example/iocBoot/ioclab/Makefile +++ b/iocs/example/iocBoot/ioclab/Makefile @@ -8,7 +8,7 @@ include $(TOP)/configure/CONFIG SCRIPTS += ../stlab.sh SCRIPTS += stlab.boot -PATH := $(PATH):/dls_sw/epics/R3.14.12.3/extensions/bin/linux-x86_64 +PATH := $(PATH):$(EPICS_EXTENSIONS)/bin/linux-x86_64 include $(TOP)/configure/RULES diff --git a/iocs/example/labApp/Db/Makefile b/iocs/example/labApp/Db/Makefile index 2deadbe1..a6c1953a 100644 --- a/iocs/example/labApp/Db/Makefile +++ b/iocs/example/labApp/Db/Makefile @@ -6,7 +6,7 @@ TOP = ../.. include $(TOP)/configure/CONFIG -PATH := $(PATH):/dls_sw/epics/R3.14.12.3/extensions/bin/linux-x86_64 +PATH := $(PATH):$(EPICS_EXTENSIONS)/bin/linux-x86_64 DB += lab_expanded.db DB += lab.db diff --git a/iocs/example/labApp/opi/edl/stlab-gui b/iocs/example/labApp/opi/edl/stlab-gui index cc53588a..05096d02 100644 --- a/iocs/example/labApp/opi/edl/stlab-gui +++ b/iocs/example/labApp/opi/edl/stlab-gui @@ -1,6 +1,10 @@ #!/bin/sh TOP="$(cd $(dirname "$0")/../..; pwd)" +# The following two definitions must be changed for each site +MOTOR="/dls_sw/prod/R3.14.12.3/support/motor/6-9dls14" +PMAC="/home/hgv27681/R3.14.12.3/support/pmac" + # first load the paths. These have been generated from the configure/RELEASE # tree. If we have a -d arg then load the opi/edl paths first shopt -s nullglob @@ -10,16 +14,16 @@ if [ "$1" = "-d" ]; then EDMDATAFILES="${EDMDATAFILES}${d}:" done EDMDATAFILES="${EDMDATAFILES}${TOP}/data:" - EDMDATAFILES="${EDMDATAFILES}/dls_sw/prod/R3.14.12.3/support/motor/6-9dls14/motorApp/opi/edl:" - EDMDATAFILES="${EDMDATAFILES}/home/hgv27681/R3.14.12.3/support/pmac/pmacApp/opi/edl:" + EDMDATAFILES="${EDMDATAFILES}${MOTOR}/motorApp/opi/edl:" + EDMDATAFILES="${EDMDATAFILES}${PMAC}/pmacApp/opi/edl:" OPTS="-x -eolc" else OPTS="-x -eolc -noedit" fi EDMDATAFILES="${EDMDATAFILES}${TOP}/data" -EDMDATAFILES="${EDMDATAFILES}:/dls_sw/prod/R3.14.12.3/support/motor/6-9dls14/data" -EDMDATAFILES="${EDMDATAFILES}:/home/hgv27681/R3.14.12.3/support/pmac/data" +EDMDATAFILES="${EDMDATAFILES}:${MOTOR}/data" +EDMDATAFILES="${EDMDATAFILES}:${PMAC}/data" export EDMDATAFILES