diff --git a/configure/E3/CONFIG_EXPORT b/configure/E3/CONFIG_EXPORT index c3cfd358889fa1cac42808f1e055904eeccc5382..159a88ee8fe08de35f26519edad7ca48148b6661 100644 --- a/configure/E3/CONFIG_EXPORT +++ b/configure/E3/CONFIG_EXPORT @@ -13,7 +13,7 @@ EXPORT_VARS+=E3_SITEMODS_PATH EXPORT_VARS+=$(filter E3_REQUIRE_%,$(.VARIABLES)) EXPORT_VARS+=QUIET -EXPORT_VARS+=$(filter %_DEP_VERSION,$(.VARIABLES)) +EXPORT_VARS+=$(foreach v,$(.VARIABLES),$(if $(findstring _DEP_VERSION,$v),$v)) EXPORT_VARS+=$(filter WITH_%,$(.VARIABLES)) EXPORT_VARS+=$(filter %_EXTERNAL,$(.VARIABLES)) diff --git a/require-ess/tools/driver.makefile b/require-ess/tools/driver.makefile index 18d98f6d885b5689405ca9bcf4e4716aed9549cc..08c12c1ab20b5f3a08f20da88830c24e37f519f4 100644 --- a/require-ess/tools/driver.makefile +++ b/require-ess/tools/driver.makefile @@ -445,13 +445,14 @@ INSTALLED_MODULES := $(sort $(notdir $(shell ls -d $(E3_SITEMODS_PATH)/* $(EPICS define fetch_module_versions _lm := $$(shell echo $1 | tr '[:upper:]' '[:lower:]') ifneq ($$(strip $$(filter $(INSTALLED_MODULES),$$(_lm))),) - $$(_lm)_VERSION := $($1_DEP_VERSION) + $$(_lm)_VERSION := $($1_DEP_VERSION$2) _MODULES += $$(_lm) else - $$(warning Invalid dependency "$1_DEP_VERSION"; pruning) + $$(warning Invalid dependency "$1_DEP_VERSION$2"; pruning) endif endef $(foreach m,$(patsubst %_DEP_VERSION,%,$(filter %_DEP_VERSION,$(.VARIABLES))),$(eval $(call fetch_module_versions,$m))) +$(foreach m,$(patsubst %_DEP_VERSION_$(T_A),%,$(filter %_DEP_VERSION_$(T_A),$(.VARIABLES))),$(eval $(call fetch_module_versions,$m,_$(T_A)))) # Fetches the data from .dep files to be parsed by the above define fetch_deps