diff --git a/src/makeBaseApp/top/configure/CONFIG b/src/makeBaseApp/top/configure/CONFIG index 55ed7e861..ae1e38dc9 100644 --- a/src/makeBaseApp/top/configure/CONFIG +++ b/src/makeBaseApp/top/configure/CONFIG @@ -1,5 +1,9 @@ # CONFIG +# You might want to change this to some shared set of rules, e.g. +# RULES=/path/to/epics/support/modules/rules/x-y +RULES=$(EPICS_BASE) + include $(TOP)/configure/RELEASE -include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH) -include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).Common @@ -8,7 +12,7 @@ ifdef T_A -include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A) endif -CONFIG=$(EPICS_BASE)/configure +CONFIG=$(RULES)/configure include $(CONFIG)/CONFIG # Override for definition in base diff --git a/src/makeBaseApp/top/configure/Makefile b/src/makeBaseApp/top/configure/Makefile index 0052e7ed3..ade29a7e9 100644 --- a/src/makeBaseApp/top/configure/Makefile +++ b/src/makeBaseApp/top/configure/Makefile @@ -1,5 +1,3 @@ -# Makefile - TOP=.. include $(TOP)/configure/CONFIG diff --git a/src/makeBaseApp/top/configure/RULES b/src/makeBaseApp/top/configure/RULES index 1f2cb5d37..6d56e14e8 100644 --- a/src/makeBaseApp/top/configure/RULES +++ b/src/makeBaseApp/top/configure/RULES @@ -1,6 +1,6 @@ # RULES -include $(EPICS_BASE)/configure/RULES +include $(CONFIG)/RULES # Library should be rebuilt because LIBOBJS may have changed. $(LIBNAME): ../Makefile diff --git a/src/makeBaseApp/top/configure/RULES.ioc b/src/makeBaseApp/top/configure/RULES.ioc index 5ba101303..901987c6c 100644 --- a/src/makeBaseApp/top/configure/RULES.ioc +++ b/src/makeBaseApp/top/configure/RULES.ioc @@ -1,2 +1,2 @@ #RULES.ioc -include $(EPICS_BASE)/configure/RULES.ioc +include $(CONFIG)/RULES.ioc diff --git a/src/makeBaseApp/top/configure/RULES_DIRS b/src/makeBaseApp/top/configure/RULES_DIRS index 804faee5e..3ba269dcc 100644 --- a/src/makeBaseApp/top/configure/RULES_DIRS +++ b/src/makeBaseApp/top/configure/RULES_DIRS @@ -1,2 +1,2 @@ #RULES_DIRS -include $(EPICS_BASE)/configure/RULES_DIRS +include $(CONFIG)/RULES_DIRS diff --git a/src/makeBaseApp/top/configure/RULES_TOP b/src/makeBaseApp/top/configure/RULES_TOP index 0620f08fb..d09d668d5 100644 --- a/src/makeBaseApp/top/configure/RULES_TOP +++ b/src/makeBaseApp/top/configure/RULES_TOP @@ -1,3 +1,3 @@ #RULES_TOP -include $(EPICS_BASE)/configure/RULES_TOP +include $(CONFIG)/RULES_TOP diff --git a/src/makeBaseApp/top/exampleBoot/Makefile b/src/makeBaseApp/top/exampleBoot/Makefile index d097ef0ad..91e47d0b5 100644 --- a/src/makeBaseApp/top/exampleBoot/Makefile +++ b/src/makeBaseApp/top/exampleBoot/Makefile @@ -2,5 +2,5 @@ TOP = .. include $(TOP)/configure/CONFIG DIRS += $(wildcard *ioc*) DIRS += $(wildcard as*) -include $(EPICS_BASE)/configure/RULES_DIRS +include $(CONFIG)/RULES_DIRS diff --git a/src/makeBaseApp/top/iocBoot/Makefile b/src/makeBaseApp/top/iocBoot/Makefile index d097ef0ad..91e47d0b5 100644 --- a/src/makeBaseApp/top/iocBoot/Makefile +++ b/src/makeBaseApp/top/iocBoot/Makefile @@ -2,5 +2,5 @@ TOP = .. include $(TOP)/configure/CONFIG DIRS += $(wildcard *ioc*) DIRS += $(wildcard as*) -include $(EPICS_BASE)/configure/RULES_DIRS +include $(CONFIG)/RULES_DIRS