diff --git a/require-ess/tools/driver.makefile b/require-ess/tools/driver.makefile index bdb0c704fd074f6000197a9fa616447664912eea..b00ecc9b0c0eaaf79190302bb7e9ad0fbc325f9d 100644 --- a/require-ess/tools/driver.makefile +++ b/require-ess/tools/driver.makefile @@ -442,9 +442,9 @@ REQUIRED := # Converts all of the X_DEP_VERSIONs to x_VERSION and records them define fetch_module_versions -_lm := $$(shell echo $1 | tr '[:upper:]' '[:lower:]') -$$(_lm)_VERSION := $($1_DEP_VERSION) -_MODULES += $$(_lm) + _lm := $$(shell echo $1 | tr '[:upper:]' '[:lower:]') + $$(_lm)_VERSION := $($1_DEP_VERSION) + _MODULES += $$(_lm) endef $(foreach m,$(patsubst %_DEP_VERSION,%,$(filter %_DEP_VERSION,$(.VARIABLES))),$(eval $(call fetch_module_versions,$m))) @@ -458,12 +458,12 @@ endef # Used to recurse through versions: updates REQUIRED and fetches all of the dependencies from the given module define update_dep_versions -m := $$(firstword $$(_MODULES)) -REQUIRED += $$m -$$m_TBL := $$(call fetch_deps,$$m) -$$m_DEPS := $$(call select,1,$$($$m_TBL),1) -_MODULES := $$(filter-out $$(REQUIRED),$$(_MODULES) $$($$m_DEPS)) -$$(foreach mm,$$($$m_DEPS),$$(eval $$(mm)_VERSION := $$(call select,2,$$($$m_TBL),$$$$(call str-eq,$$$$1,$$(mm))))) + m := $$(firstword $$(_MODULES)) + REQUIRED += $$m + $$m_TBL := $$(call fetch_deps,$$m) + $$m_DEPS := $$(call select,1,$$($$m_TBL),1) + _MODULES := $$(filter-out $$(REQUIRED),$$(_MODULES) $$($$m_DEPS)) + $$(foreach mm,$$($$m_DEPS),$$(eval $$(mm)_VERSION := $$(call select,2,$$($$m_TBL),$$$$(call str-eq,$$$$1,$$(mm))))) endef $(call while,$$(_MODULES),$(update_dep_versions))