From df17da67ab4e75fbb6f9ed495e82979871ddcfa8 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Mon, 29 Jun 2020 08:49:58 +0200 Subject: [PATCH] allow to build using 1 out of 4 digits of epics base, e.g. 7 for 7.0.4.1 --- 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 ef4dba9..5bc537b 100644 --- a/App/tools/driver.makefile +++ b/App/tools/driver.makefile @@ -141,7 +141,7 @@ INSTALLED_EPICS_VERSIONS := $(patsubst ${EPICS_LOCATION}/base-%,%,$(wildcard ${E EPICS_VERSIONS = $(filter-out ${EXCLUDE_VERSIONS:=%},${DEFAULT_EPICS_VERSIONS}) MISSING_EPICS_VERSIONS = $(filter-out ${BUILD_EPICS_VERSIONS},${EPICS_VERSIONS}) BUILD_EPICS_VERSIONS = $(filter ${INSTALLED_EPICS_VERSIONS},${EPICS_VERSIONS}) -$(foreach v,$(sort $(basename $(basename ${BUILD_EPICS_VERSIONS})) $(basename ${BUILD_EPICS_VERSIONS})),$(eval EPICS_VERSIONS_$v=$(filter $v.%,${BUILD_EPICS_VERSIONS}))) +$(foreach v,$(sort $(basename $(basename $(basename ${BUILD_EPICS_VERSIONS}))) $(basename $(basename ${BUILD_EPICS_VERSIONS})) $(basename ${BUILD_EPICS_VERSIONS})),$(eval EPICS_VERSIONS_$v=$(filter $v.%,${BUILD_EPICS_VERSIONS}))) SUBMODULES:=$(foreach f,$(wildcard .gitmodules),$(shell awk '/^\[submodule/ { print gensub(/["\]]/,"","g",$$2) }' $f))