Merge pull request #150 from epics-modules/issue149

Reverted the commit that caused issue 149 and updated the driver modules' EXAMPLE_RELEASE.local files to avoid problems when building them outside the motor tree.

Fixes #149
This commit is contained in:
Kevin Peterson
2019-11-04 10:49:44 -06:00
committed by GitHub
32 changed files with 36 additions and 36 deletions
+5 -5
View File
@@ -9,7 +9,7 @@
#
# Add your declarations here
SUPPORT=
SUPPORT=/path/to/support
# If any motor controller communication mechanism besides
# the VME backplane is required, then ASYN must be defined.
@@ -23,7 +23,7 @@ SNCSEQ=$(SUPPORT)/seq-2-2-6
BUSY=$(SUPPORT)/busy-R1-7-1
# Recommended EPICS release: R3.15.6
EPICS_BASE=
EPICS_BASE=/path/to/base
# The following must be defined for motorMXmotor
#!MX=$(SUPPORT)/mx/mx
@@ -44,6 +44,6 @@ IPAC=$(SUPPORT)/ipac-R2-15
# These lines allow developers to override these RELEASE settings
# without having to modify this file directly.
-include $(or $(MOTOR),$(TOP))/../RELEASE.local
-include $(or $(MOTOR),$(TOP))/../RELEASE.$(EPICS_HOST_ARCH).local
-include $(or $(MOTOR),$(TOP))/configure/RELEASE.local
-include $(TOP)/../RELEASE.local
-include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local
-include $(TOP)/configure/RELEASE.local