From ac2f4f6cc72ae16484b64aebc37cc5ff43916c64 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 2 Mar 2019 09:50:58 +0000 Subject: [PATCH] Fix: JANWARE_WiKI for client jw needs a conditional Signed-off-by: Jan Lindemann --- make/defs.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index 31a18b57..258be434 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -186,9 +186,13 @@ endif JANWARE_CLIENT ?= jw CUSTOMER ?= $(JANWARE_CLIENT) -JANWARE_WIKI ?= $(JANWARE_CLIENT) +ifeq ($(JANWARE_CLIENT),jw) + JANWARE_WIKI ?= priv +else + JANWARE_WIKI ?= $(JANWARE_CLIENT) +endif JANWARE_URL_DOC_MODULE ?= https://janware.com/wiki/$(JANWARE_WIKI)/assets/types/data/sw/$(PROJECT)/$(notdir $(CWD)) -JANWARE_URL_DOC_PROJECT ?= https://janware.com/wiki/$(JANWARE_WIKI)/assets/types/data/sw/$(PROJECT)/$(PROJECT) +JANWARE_URL_DOC_PROJECT ?= https://janware.com/wiki/$(JANWARE_WIKI)/assets/types/data/sw/$(PROJECT)/start PUBLIC_PATH_DEVEL_DOC = /doc/devel UPLOAD_URL_DEVEL_DOC = rsync_ssh://$(JANWARE_USER)@janware.com:/srv/dav/pub/clients/$(JANWARE_CLIENT)/$(PUBLIC_PATH_DEVEL_DOC) PKG_VENDOR ?= janware GmbH