From ab872fe334a8e716b7a440760dcdcec9540a4b13 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 28 Feb 2019 16:12:31 +0000 Subject: [PATCH] git-submod.mk: Add support for USE_USER_URL Signed-off-by: Jan Lindemann --- make/git-submod.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/make/git-submod.mk b/make/git-submod.mk index cdb79e85..2dd529a1 100644 --- a/make/git-submod.mk +++ b/make/git-submod.mk @@ -4,9 +4,13 @@ # - include # - run git-init-submod-remote -GIT_SRV_ADMIN_SH = ssh $(JANWARE_USER)@git.janware.com /opt/jw-build/bin/git-srv-admin.sh -GIT_REPO_URL = ssh://$(JANWARE_USER)@git.janware.com/srv/git/$(JANWARE_USER)/contrib/$(PROJECT_DIRNAME) -SUBMOD_PATH = $(patsubst $(abspath $(TOPDIR))/%,%,$(abspath $(shell $(PWD))/$(SUBMOD_SRC_DIR))) +ifeq ($(USE_USER_URL),) + JANWARE_USER_PREFIX = $(JANWARE_USER)@ +endif + +GIT_SRV_ADMIN_SH = ssh $(JANWARE_USER_PREFIX)git.janware.com /opt/jw-build/bin/git-srv-admin.sh +GIT_REPO_URL = ssh://$(JANWARE_USER_PREFIX)git.janware.com/srv/git/$(JANWARE_USER)/contrib/$(PROJECT_DIRNAME) +SUBMOD_PATH = $(patsubst $(abspath $(TOPDIR))/%,%,$(abspath $(shell $(CWD))/$(SUBMOD_SRC_DIR))) SUBMOD_SRC_DIR ?= . SUB_GIT = git -C $(SUBMOD_SRC_DIR)