E3-521: Removed REQUIRE_CONFIG in place of E3_REQUIRE_CONFIG

configure/CONFIG

@@ -19,16 +19,16 @@ endif
 
 
 E3_MODULES_PATH:=$(EPICS_BASE)
-REQUIRE_CONFIG:=$(TOP)/configure/E3
+E3_REQUIRE_CONFIG:=$(TOP)/configure/E3
 
 include $(EPICS_BASE)/configure/CONFIG_BASE_VERSION
-include $(REQUIRE_CONFIG)/CONFIG_REQUIRE
-include $(REQUIRE_CONFIG)/CONFIG_SHELL
-include $(REQUIRE_CONFIG)/CONFIG_E3_PATH
-include $(REQUIRE_CONFIG)/CONFIG_E3_MAKEFILE
-include $(REQUIRE_CONFIG)/CONFIG_TEST
-include $(REQUIRE_CONFIG)/CONFIG_EPICS
-include $(REQUIRE_CONFIG)/CONFIG_EXPORT
+include $(E3_REQUIRE_CONFIG)/CONFIG_REQUIRE
+include $(E3_REQUIRE_CONFIG)/CONFIG_SHELL
+include $(E3_REQUIRE_CONFIG)/CONFIG_E3_PATH
+include $(E3_REQUIRE_CONFIG)/CONFIG_E3_MAKEFILE
+include $(E3_REQUIRE_CONFIG)/CONFIG_TEST
+include $(E3_REQUIRE_CONFIG)/CONFIG_EPICS
+include $(E3_REQUIRE_CONFIG)/CONFIG_EXPORT
 
 # Exclude generated EPICS base variables from make vars report.
 VARS_EXCLUDES+=BASE_3_14

configure/E3/CONFIG

@@ -4,17 +4,18 @@
 E3_MODULE_VERSION:=$(E3_MODULE_VERSION)$(shell (echo "$(E3_MODULE_VERSION)" | grep -Eq "^[0-9]+\.[0-9]+\.[0-9]+\$$") && echo +0)
 
 E3_MODULES_PATH?=$(E3_SITEMODS_PATH)
+E3_REQUIRE_CONFIG:=$(E3_REQUIRE_LOCATION)/configure
 
 include $(EPICS_BASE)/configure/CONFIG_BASE_VERSION
-include $(REQUIRE_CONFIG)/CONFIG_REQUIRE
-include $(REQUIRE_CONFIG)/CONFIG_SHELL
-include $(REQUIRE_CONFIG)/CONFIG_CELL
-include $(REQUIRE_CONFIG)/CONFIG_TEST
-include $(REQUIRE_CONFIG)/CONFIG_E3_PATH
-include $(REQUIRE_CONFIG)/CONFIG_E3_MAKEFILE
-include $(REQUIRE_CONFIG)/CONFIG_EPICS
-include $(REQUIRE_CONFIG)/CONFIG_DKMS
-include $(REQUIRE_CONFIG)/CONFIG_EXPORT
+include $(E3_REQUIRE_CONFIG)/CONFIG_REQUIRE
+include $(E3_REQUIRE_CONFIG)/CONFIG_SHELL
+include $(E3_REQUIRE_CONFIG)/CONFIG_CELL
+include $(E3_REQUIRE_CONFIG)/CONFIG_TEST
+include $(E3_REQUIRE_CONFIG)/CONFIG_E3_PATH
+include $(E3_REQUIRE_CONFIG)/CONFIG_E3_MAKEFILE
+include $(E3_REQUIRE_CONFIG)/CONFIG_EPICS
+include $(E3_REQUIRE_CONFIG)/CONFIG_DKMS
+include $(E3_REQUIRE_CONFIG)/CONFIG_EXPORT
 
 VARS_EXCLUDES+=BASE_3_14
 VARS_EXCLUDES+=BASE_3_15

configure/E3/CONFIG_REQUIRE

@@ -10,4 +10,3 @@ E3_REQUIRE_LIB:=$(E3_REQUIRE_LOCATION)/lib
 E3_REQUIRE_DB:=$(E3_REQUIRE_LOCATION)/db
 E3_REQUIRE_DBD:=$(E3_REQUIRE_LOCATION)/dbd
 E3_REQUIRE_INC:=$(E3_REQUIRE_LOCATION)/include
-E3_REQUIRE_CONFIG:=$(E3_REQUIRE_LOCATION)/configure

configure/E3/RULES_E3

@@ -76,7 +76,7 @@ clean: conf
 all: init patch rebuild
 
 # Copy $(E3_MODULE_MAKEFILE) into $(E3_MODULE_SRC_PATH)
-include $(REQUIRE_CONFIG)/RULES_CHECKS
+include $(E3_REQUIRE_CONFIG)/RULES_CHECKS
 conf: consistency_checks
 	$(QUIET) install -p -m 644 $(TOP)/$(E3_MODULE_MAKEFILE)  $(E3_MODULE_SRC_PATH)/
 

configure/E3/RULES_SITEMODS

 # -*- mode: Makefile;-*-
 
-include $(REQUIRE_CONFIG)/RULES_E3
-include $(REQUIRE_CONFIG)/RULES_CELL
-include $(REQUIRE_CONFIG)/DEFINES_FT
-include $(REQUIRE_CONFIG)/RULES_PATCH
-include $(REQUIRE_CONFIG)/RULES_TEST
+include $(E3_REQUIRE_CONFIG)/RULES_E3
+include $(E3_REQUIRE_CONFIG)/RULES_CELL
+include $(E3_REQUIRE_CONFIG)/DEFINES_FT
+include $(E3_REQUIRE_CONFIG)/RULES_PATCH
+include $(E3_REQUIRE_CONFIG)/RULES_TEST
 
-include $(REQUIRE_CONFIG)/RULES_DKMS
-include $(REQUIRE_CONFIG)/RULES_VARS
+include $(E3_REQUIRE_CONFIG)/RULES_DKMS
+include $(E3_REQUIRE_CONFIG)/RULES_VARS
 
-include $(REQUIRE_CONFIG)/RULES_DEV
+include $(E3_REQUIRE_CONFIG)/RULES_DEV

configure/RULES

 # -*- mode: Makefile;-*-
 # include $(EPICS_BASE)/configure/RULES
 
-include $(REQUIRE_CONFIG)/DEFINES_FT
+include $(E3_REQUIRE_CONFIG)/DEFINES_FT
 #
 # We cannot use file operation in CentOS7.4,
 # because Makefile version is 3.8.
-include $(REQUIRE_CONFIG)/RULES_E3
-include $(REQUIRE_CONFIG)/RULES_EPICS
+include $(E3_REQUIRE_CONFIG)/RULES_E3
+include $(E3_REQUIRE_CONFIG)/RULES_EPICS
 
 
 include $(TOP)/configure/module/RULES_REQUIRE
 
-include $(REQUIRE_CONFIG)/RULES_PATCH
-include $(REQUIRE_CONFIG)/RULES_VARS
+include $(E3_REQUIRE_CONFIG)/RULES_PATCH
+include $(E3_REQUIRE_CONFIG)/RULES_VARS
 include $(TOP)/configure/module/RULES_TEST
 
 
 ifneq (,$(findstring dev,$(MAKECMDGOALS)))
-include $(REQUIRE_CONFIG)/RULES_DEV
+include $(E3_REQUIRE_CONFIG)/RULES_DEV
 endif

configure/module/RULES_REQUIRE

@@ -28,13 +28,13 @@ requireconf: e3-site-path e3-require-path
 	$(QUIET) install    -m 755 $(E3_MODULE_SRC_PATH)/tools/revision_number       $(E3_REQUIRE_TOOLS)/
 	$(QUIET) install    -m 755 $(E3_SHELL_FILES)             $(E3_REQUIRE_BIN)/
 	$(QUIET) install    -m 644 $(E3_IOC_CFG_FILES)           $(E3_REQUIRE_BIN)/
-	$(QUIET) install    -m 644 $(E3_REQUIRE_CONF_FILES)      $(E3_REQUIRE_CONFIG)/
+	$(QUIET) install    -m 644 $(E3_REQUIRE_CONF_FILES)      $(E3_REQUIRE_LOCATION)/configure/
 
 
 e3-require-path:
 	$(QUIET) install -d -m 755 $(E3_REQUIRE_TOOLS)
 	$(QUIET) install -d -m 755 $(E3_REQUIRE_BIN)
-	$(QUIET) install -d -m 755 $(E3_REQUIRE_CONFIG)
+	$(QUIET) install -d -m 755 $(E3_REQUIRE_LOCATION)/configure
 
 
 e3-site-path: