diff --git a/configure/E3/RULES_REQUIRE b/configure/E3/RULES_REQUIRE index 52bb2c2c8cf5d5fb106201be980d8aadc00d9272..715461af1908381282d315b93376e303e14cafac 100644 --- a/configure/E3/RULES_REQUIRE +++ b/configure/E3/RULES_REQUIRE @@ -45,6 +45,13 @@ e3-site-path: $(QUIET) $(SUDO) install -d -m 755 $(E3_SITEAPPS_PATH) + e3-site-conf: - $(QUIET) $(file > $(G_E3_CFG_FILE), $(E3_CFG_VARS)) +# Makefile VERSION > 4.x is needed, DEFINES_REQUIRE can be found in a19eb01 +# $(QUIET) $(file > $(G_E3_CFG_FILE), $(E3_CFG_VARS)) + @echo "declare -g DEFAULT_EPICS_BASE=$(E3_MODULES_PATH)" > $(G_E3_CFG_FILE) + @echo "declare -g DEFAULT_REQUIRE_NAME=$(E3_REQUIRE_NAME)" >> $(G_E3_CFG_FILE) + @echo "declare -g DEFAULT_REQUIRE_VERSION=$(E3_REQUIRE_VERSION)" >> $(G_E3_CFG_FILE) + + diff --git a/configure/RULES b/configure/RULES index acb75f623a90f1e5e1a3bb980398eeaeb168aaff..99f2c96349f6a172d74f3da25cdecc1c38bf583c 100644 --- a/configure/RULES +++ b/configure/RULES @@ -2,10 +2,14 @@ # include $(EPICS_BASE)/configure/RULES include $(TOP)/configure/E3/DEFINES_FT -include $(TOP)/configure/E3/DEFINES_REQUIRE +# +# We cannot use file operation in CentOS7.4, +# because Makefile version is 3.8. +# include $(TOP)/configure/E3/DEFINES_REQUIRE include $(TOP)/configure/E3/RULES_E3 include $(TOP)/configure/E3/RULES_EPICS + include $(TOP)/configure/E3/RULES_REQUIRE include $(TOP)/configure/E3/RULES_DB diff --git a/tools/ess-env.conf b/tools/ess-env.conf index d8b86c336876581d7bec5c0ea9b1955b18e1cd58..420744f1f33d488272dd1bda2315fcede06bbb9e 100644 --- a/tools/ess-env.conf +++ b/tools/ess-env.conf @@ -1 +1 @@ -IOCSH_HASH_VERSION=4530dfe +IOCSH_HASH_VERSION=a19eb01