From d8a2d1c080b1f4f260630cde801deb06ec8f3cc4 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Tue, 14 Apr 2020 14:26:18 +0200 Subject: [PATCH] Handle 4 digit EPICS versions like 7.0.3.2 --- App/tools/driver.makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/App/tools/driver.makefile b/App/tools/driver.makefile index 89dfbce..4b68ecf 100644 --- a/App/tools/driver.makefile +++ b/App/tools/driver.makefile @@ -265,7 +265,7 @@ $(1): prebuild %.$(1): prebuild +for VERSION in $${EPICS_VERSIONS_$(1)}; do $${MAKEVERSION} EPICSVERSION=$$$$VERSION $${@:%.$(1)=%}; done endef -$(foreach v,$(sort $(basename $(basename ${INSTALLED_EPICS_VERSIONS})) $(basename ${INSTALLED_EPICS_VERSIONS})),$(eval $(call VERSIONRULES,$v))) +$(foreach v,$(filter-out ${INSTALLED_EPICS_VERSIONS},$(sort $(basename $(basename $(basename ${INSTALLED_EPICS_VERSIONS}))) $(basename $(basename ${INSTALLED_EPICS_VERSIONS})) $(basename ${INSTALLED_EPICS_VERSIONS}))),$(eval $(call VERSIONRULES,$v))) # Handle cases where user requests one specific version: # make . instead of make or