From 41801b38cbbc5c98df8ac81f8704900efca5c1e3 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Tue, 2 Jul 2024 16:35:00 +0200 Subject: [PATCH] allow multiple entries in GIT_DOMAIN --- App/tools/driver.makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/App/tools/driver.makefile b/App/tools/driver.makefile index 9da9922..cfd079f 100644 --- a/App/tools/driver.makefile +++ b/App/tools/driver.makefile @@ -180,7 +180,7 @@ export MAKE_FIRST export SUBMODULES export USE_LIBVERSION -export ORIGIN=$(firstword $(shell git remote -v 2>/dev/null | awk '/${GIT_DOMAIN}.*(fetch)/{print $$2;exit}')$(patsubst %,[%],$(shell git describe --tags --dirty --always --long 2>/dev/null)) $(PWD)) +export ORIGIN=$(firstword $(foreach D,${GIT_DOMAIN},$(shell git remote -v 2>/dev/null | awk '/$(subst .,\.,$D).*\(fetch\)/{print $$2;exit}')$(patsubst %,[%],$(shell git describe --tags --dirty --always --long 2>/dev/null))) $(PWD)) # Some shell commands: RMDIR = rm -rf @@ -257,6 +257,7 @@ debug:: @echo "ARCH_FILTER = ${ARCH_FILTER}" @echo "PRJ = ${PRJ}" @echo "GIT_DOMAIN = ${GIT_DOMAIN}" + @echo "ORIGIN = ${ORIGIN}" what:: @echo "LIBVERSION = ${LIBVERSION}"