diff --git a/.gitignore b/.gitignore index 7f2ad27..0ae6b2b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ include *.pdf *.*log StreamVersion.h +*.local diff --git a/Makefile b/Makefile index 4e56eec..5a2e3c9 100644 --- a/Makefile +++ b/Makefile @@ -21,21 +21,10 @@ # along with StreamDevice. If not, see https://www.gnu.org/licenses/. #########################################################################/ -TOP = .. -ifneq ($(wildcard ../configure),) - # We are in an EPICS R3.14+ location - include $(TOP)/configure/CONFIG -else ifneq ($(wildcard ../config),) - # We are in an EPICS R3.13 location - CONFIG = $(TOP)/config - include $(TOP)/config/CONFIG_APP -else - # Using our own local configuration - TOP = . - DIRS = configure - src_DEPEND_DIRS := $(DIRS) - include $(TOP)/configure/CONFIG -endif +TOP = . +DIRS = configure +src_DEPEND_DIRS := $(DIRS) +include $(TOP)/configure/CONFIG DIRS += src DIRS += streamApp diff --git a/docs/setup.html b/docs/setup.html index 28c3d20..98fe6ec 100644 --- a/docs/setup.html +++ b/docs/setup.html @@ -54,15 +54,17 @@ git clone https://github.com/paulscherrerinstitute/StreamDevice.git

StreamDevice now comes with a standard configure directory. -But it can still be built in an external <top> +But it can still be built in an external <top> directory as in previous versions. It will automatically detect <top> locations from the presence of ../configure or ../config -directories. +directories. Using an upper level ../configure is +no longer supported due to compatibility issues with SynApps.

Edit the configure/RELEASE file to specify the install location -of EPICS base and of additional software modules, for example: +of EPICS base and of additional software modules or add a +configure/RELEASE.local file to overwrite, for example:

 EPICS_BASE=/home/epics/base-3.16.1
 
diff --git a/src/Makefile b/src/Makefile index 9759b55..280a219 100644 --- a/src/Makefile +++ b/src/Makefile @@ -21,16 +21,8 @@ # along with StreamDevice. If not, see https://www.gnu.org/licenses/. #########################################################################/ -TOP = ../.. -ifneq ($(wildcard ../../configure),) - include $(TOP)/configure/CONFIG -else ifneq ($(wildcard ../../config),) - include $(TOP)/config/CONFIG_APP - include $(TOP)/config/RULES_ARCHS -else - TOP= .. - include $(TOP)/configure/CONFIG -endif +TOP= .. +include $(TOP)/configure/CONFIG -include CONFIG_STREAM -include ../CONFIG_STREAM diff --git a/streamApp/Makefile b/streamApp/Makefile index 0b4198e..2dc48ae 100644 --- a/streamApp/Makefile +++ b/streamApp/Makefile @@ -21,16 +21,8 @@ # along with StreamDevice. If not, see https://www.gnu.org/licenses/. #########################################################################/ -TOP = ../.. -ifneq ($(wildcard ../../configure),) - include $(TOP)/configure/CONFIG -else ifneq ($(wildcard ../../config),) - include $(TOP)/config/CONFIG_APP - include $(TOP)/config/RULES_ARCHS -else - TOP= .. - include $(TOP)/configure/CONFIG -endif +TOP= .. +include $(TOP)/configure/CONFIG PROD = streamApp DBD = streamApp.dbd