From 964390c79d42cd830ce0421fa24b487b31ea66e7 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 6 Dec 2016 19:35:44 +0000 Subject: [PATCH] projects-dir.mk: Allow external CVS_RSH Last commits on projects-dir.mk and projs-dir.mk disallowed redefinition of CVS_RSH, which is bad for automatic build, undo that. Signed-off-by: Jan Lindemann --- make/projects-dir.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 1bdf2f53..948e7f78 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -47,12 +47,15 @@ ifeq ($(JANWARE_USER),) endif export CVSROOT = :ext:$(JANWARE_USER)@cvs.jannet.de:/home/jannet/arc/cvs -export CVS_RSH = ssh + +ifeq ($(CVS_RSH),) + export CVS_RSH = ssh +endif ifneq ($(CLONE_FROM_USER),) export PGIT_CLONE_FROM_USER = $(CLONE_FROM_USER) else - export PGIT_CLONE_FROM_USER=$(JANWARE_USER) + export PGIT_CLONE_FROM_USER = $(JANWARE_USER) endif # ------------ commands