diff --git a/configure/E3/CONFIG_EXPORT b/configure/E3/CONFIG_EXPORT index e5ab2181f4b2ab128afac228d7d67b20d64d7f67..6aeb4e9b4da846de22e6e29cd2d5f2239ec80475 100644 --- a/configure/E3/CONFIG_EXPORT +++ b/configure/E3/CONFIG_EXPORT @@ -1,12 +1,6 @@ # Variables should be transferred to module_name.makefile -EPICS_HOST_ARCH:=$(shell $(EPICS_BASE)/startup/EpicsHostArch.pl 2> /dev/null) - -# In near future, BASE may drop "startup" directory, so -# Note that the following line is not the same as e3-base, CONFIG_EXPORT -ifeq ($(strip $(EPICS_HOST_ARCH)),) EPICS_HOST_ARCH:=$(shell perl $(EPICS_BASE)/lib/perl/EpicsHostArch.pl 2> /dev/null) -endif MSI:=$(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)/msi diff --git a/configure/modules/CONFIG_EXPORT b/configure/modules/CONFIG_EXPORT index 8ed09578dd9a3b5145e074be7938870de99ff4a8..6d5b66093de4e210d1c539f72b5e2ea155d3a2f9 100644 --- a/configure/modules/CONFIG_EXPORT +++ b/configure/modules/CONFIG_EXPORT @@ -1,12 +1,6 @@ # Variables should be transferred to module_name.makefile -EPICS_HOST_ARCH:=$(shell $(EPICS_BASE)/startup/EpicsHostArch.pl 2> /dev/null) - -# In near future, BASE may drop "startup" directory, so -# Note that the following line is not the same as e3-base, CONFIG_EXPORT -ifeq ($(strip $(EPICS_HOST_ARCH)),) EPICS_HOST_ARCH:=$(shell perl $(EPICS_BASE)/lib/perl/EpicsHostArch.pl 2> /dev/null) -endif MSI:=$(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)/msi diff --git a/require-ess/tools/setE3Env.bash b/require-ess/tools/setE3Env.bash index d8294f4a07582328dbf364695d9d9368061de37b..6cd4127bde80936e33e823ccc11baf3412220438 100644 --- a/require-ess/tools/setE3Env.bash +++ b/require-ess/tools/setE3Env.bash @@ -214,12 +214,7 @@ else fi -epics_host_arch_file="${EPICS_BASE}/startup/EpicsHostArch.pl" -if [ -e "$epics_host_arch_file" ]; then - EPICS_HOST_ARCH=$("${EPICS_BASE}/startup/EpicsHostArch.pl") -else - EPICS_HOST_ARCH=$(perl "${EPICS_BASE}"/lib/perl/EpicsHostArch.pl) -fi +EPICS_HOST_ARCH=$(perl "${EPICS_BASE}"/lib/perl/EpicsHostArch.pl) E3_REQUIRE_BIN=${E3_REQUIRE_LOCATION}/bin E3_REQUIRE_LIB=${E3_REQUIRE_LOCATION}/lib