diff --git a/.gitignore b/.gitignore index a075596..27bd762 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,4 @@ envPaths dllPath.bat auto_settings.sav* auto_positions.sav* - +RELEASE.local diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 212485e..c2c7fa1 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -39,5 +39,6 @@ CHECK_RELEASE = YES # settings without having to modify the configure/CONFIG_SITE # file itself. -include $(TOP)/../CONFIG_SITE.local +-include $(TOP)/../configure/CONFIG_SITE.local -include $(TOP)/configure/CONFIG_SITE.local diff --git a/configure/RELEASE b/configure/RELEASE index 33c00fd..2c0767d 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -23,3 +23,9 @@ EPICS_BASE=/corvette/usr/local/epics-devel/base-3.15.5 #Capfast users may need the following definitions #CAPFAST_TEMPLATES= #SCH2EDIF_PATH= + +# These lines allow developers to override these RELEASE settings +# without having to modify this file directly. +-include $(TOP)/../RELEASE.local +-include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local +-include $(TOP)/configure/RELEASE.local