forked from epics_driver_modules/motorBase
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:
+5
-5
@@ -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
|
||||
|
||||
+1
-1
Submodule modules/motorAMCI updated: cfd32e400c...53b22b302e
+1
-1
Submodule modules/motorAcs updated: ba3193b340...ebbb747a72
+1
-1
Submodule modules/motorAcsTech80 updated: f409282bba...9fe15a2860
+1
-1
Submodule modules/motorAerotech updated: 1b8e4c0023...9abae6420d
+1
-1
Submodule modules/motorAttocube updated: 8f1a9aa444...331069c605
+1
-1
Submodule modules/motorDeltaTau updated: 9b49dd5f23...ab27eae3eb
+1
-1
Submodule modules/motorFaulhaber updated: e028325b50...62ae8c9d46
+1
-1
Submodule modules/motorHytec updated: 7872aebc0f...b82e4a4bee
+1
-1
Submodule modules/motorIms updated: 10c502c8dc...95ead31379
+1
-1
Submodule modules/motorKohzu updated: d4f694d586...ac82602706
+1
-1
Submodule modules/motorMXmotor updated: 5fa1221426...f58865ae74
+1
-1
Submodule modules/motorMclennan updated: f4f1708497...8a84e307b9
+1
-1
Submodule modules/motorMicos updated: e92135f37c...6049202cd3
+1
-1
Submodule modules/motorMicroMo updated: 04331b5cfa...c1b16db9a8
+1
-1
Submodule modules/motorMicronix updated: 59a7f06fbf...1afcc7e36a
+1
-1
Submodule modules/motorMotorSim updated: 20bd29c8ea...ed21eac096
+1
-1
Submodule modules/motorNPoint updated: 4d2f297414...f935b02bd5
+1
-1
Submodule modules/motorNewFocus updated: 9b5dc61554...0000255ab0
+1
-1
Submodule modules/motorNewport updated: 6201b85711...4cf6214bff
+1
-1
Submodule modules/motorOms updated: ee078b399c...53030c9fce
+1
-1
Submodule modules/motorOmsAsyn updated: e949e2c51c...4fdd003bce
+1
-1
Submodule modules/motorOriel updated: e325636dbb...9f85ecde56
+1
-1
Submodule modules/motorPI updated: 3e8d6cc3fc...045f6cf2b3
+1
-1
Submodule modules/motorPIGCS2 updated: 59b31e0cec...98d36131b2
+1
-1
Submodule modules/motorParker updated: efe069c2c2...03ef9ca874
+1
-1
Submodule modules/motorPhytron updated: 4c2140414e...72281de833
+1
-1
Submodule modules/motorPiJena updated: 1dd01ea908...733d9b0e6b
+1
-1
Submodule modules/motorScriptMotor updated: 495b57a61c...5517d7deaf
+1
-1
Submodule modules/motorSmarAct updated: 66015236bd...22a1fbe904
+1
-1
Submodule modules/motorSmartMotor updated: 23eb223b1d...8a1b9cb9e3
+1
-1
Submodule modules/motorThorLabs updated: 11365b26a6...9ec46c1b32
Reference in New Issue
Block a user