From 71f677580b1748fd2fdf5653a52292c94da48ec9 Mon Sep 17 00:00:00 2001 From: rivers Date: Wed, 13 Jul 2011 20:56:39 +0000 Subject: [PATCH] Do not expand $(SUPPORT) ; include files to define SUPPORT and EPICS_BASE git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@13131 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b --- configure/RELEASE | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/configure/RELEASE b/configure/RELEASE index 0255b50..b6f1a47 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -8,31 +8,32 @@ TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top # define INSTALL_LOCATION_APP here #INSTALL_LOCATION_APP= -#If using the sequencer, point SNCSEQ at its top directory: -#SNCSEQ=/corvette/home/epics/devel/seq/2-0-11 +SUPPORT=/corvette/home/epics/devel +-include $(TOP)/../configure/SUPPORT.$(EPICS_HOST_ARCH) # ASYN is needed for sockets and for smartControl -ASYN=/corvette/home/epics/devel/asyn-4-17 +ASYN=$(SUPPORT)/asyn-4-17 # CALC is needed for scalcout record that SSCAN uses -CALC=/corvette/home/epics/devel/calc-2-8 +CALC=$(SUPPORT)/calc-2-8 # BUSY is needed for busy record -BUSY=/corvette/home/epics/devel/busy-1-3 +BUSY=$(SUPPORT)/busy-1-3 # SSCAN is needed for scanning threshold on Pilatus -SSCAN=/corvette/home/epics/devel/sscan-2-6-6 +SSCAN=$(SUPPORT)/sscan-2-6-6 # MCA is needed for fast accumulation of ROI counts -MCA=/corvette/home/epics/devel/mca-6-12-4 +MCA=$(SUPPORT)/mca-6-12-4 #AUTOSAVE is needed for save_restore -AUTOSAVE=/corvette/home/epics/devel/autosave-4-7 +AUTOSAVE=$(SUPPORT)/autosave-4-7 -AREA_DETECTOR=/corvette/home/epics/devel/areaDetector-1-7beta1 +AREA_DETECTOR=$(SUPPORT)/areaDetector-1-7beta1 # EPICS_BASE usually appears last so other apps can override stuff: EPICS_BASE=/corvette/usr/local/epics/base-3.14.12.1 +-include $(TOP)/../configure/EPICS_BASE.$(EPICS_HOST_ARCH) #Capfast users may need the following definitions #CAPFAST_TEMPLATES=