diff --git a/configure/.gitignore b/configure/.gitignore new file mode 100644 index 0000000..2ad9294 --- /dev/null +++ b/configure/.gitignore @@ -0,0 +1 @@ +*.local diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index ac4c4df..559e2d8 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -38,3 +38,6 @@ PY_VER=2.7 # Module will be build against this version of the # Python interpreter #PYTHON = python$(PY_VER) + +-include $(TOP)/configure/CONFIG_SITE.local +-include $(TOP)/../CONFIG_SITE.local diff --git a/configure/RELEASE b/configure/RELEASE index 1252dc5..ba1fc22 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -33,6 +33,10 @@ TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top # logging of remote settings changes #CAPUTLOG=$(EPICS_BASE) -# EPICS_BASE usually appears last so other apps can override stuff: -EPICS_BASE=/usr/lib/epics +## Required Modules ## +# EPICS_BASE usually appears last so other apps can override stuff: +#EPICS_BASE=/usr/lib/epics + +-include $(TOP)/configure/RELEASE.local +-include $(TOP)/../RELEASE.local