From 16e0db76f9659e71d1b98404d13ba8f68cfbee6c Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 23 Oct 2018 10:48:54 +0000 Subject: [PATCH] projects-dir.mk: Rename jannet executable to jw-pkg Signed-off-by: Jan Lindemann --- make/projects-dir.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 030a58a9..7d520c54 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -76,7 +76,7 @@ ifeq ($(JANWARE_USER),) UNAVAILABLE_TARGETS ?= pull.done update.done clone.done else UNAVAILABLE_TARGETS ?= - export CVSROOT = :ext:$(JANWARE_USER)@cvs.jannet.de:/home/jannet/arc/cvs + export CVSROOT = :ext:$(JANWARE_USER)@cvs.janware.com:/home/jannet/arc/cvs endif ifneq ($(JW_BUILD_SSH),) @@ -110,11 +110,11 @@ RELEASE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/build PKG_MANAGER_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pkg-manager.sh /opt/jw-build/bin/pkg-manager.sh) pkg-manager-not-found) CREATE_PROJECT_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-build-create-project.sh /opt/jw-build/bin/jw-build-create-project.sh) jw-build-create-project-not-found) LIST_VCS_FILES = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/list-cvs-files.sh /opt/jw-build/bin/list-cvs-files.sh) list-cvs-files-not-found) -JANWARE_PKG = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jannet /opt/jw-build/bin/jannet) jannet-not-found) +JANWARE_PKG = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/js-pkg /opt/jw-build/bin/jannet) jw-pkg-not-found) BROWSER ?= xdg-open EDITOR ?= xdg-open -GIT_SRV_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/git-srv-admin.sh -CVS_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/cvs-admin.sh +GIT_SRV_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.janware.com /opt/jw-build/bin/git-srv-admin.sh +CVS_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.janware.com /opt/jw-build/bin/cvs-admin.sh # ------------ targets