diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 364e9b81..6797402d 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -1,6 +1,6 @@ # # This is the toplevel Makefile for a janware GmbH software build tree. It is -# provided under the terms of the Gnu Lesser Public License, Version 2. +# provided under the terms of the GNU Lesser Public License, Version 2. # # You will need a janware.com user account for pretty much anything this # Makefile does. Ask admin@janware.com if you want one. @@ -9,7 +9,7 @@ # for some on-line documentation of how this is meant to work. # -# ------------ makefile and environment variables +# ------------ Makefile and environment variables ifneq ($(PROJECTS),) export PGIT_CLONE_PROJECTS = $(PROJECTS) @@ -60,7 +60,7 @@ ifneq ($(EXCLUDE_FROM_BUILD),) BUILD_PY_EXTRA_ARGS += --exclude "$(EXCLUDE_FROM_BUILD)" endif -# ------------ commands +# ------------ external programs MOD_SCRIPT_DIR = ./jw-build/scripts PGIT = CLONE_PROJECTS="$(PROJECTS)" /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pgit.sh /opt/jw-build/bin/pgit.sh) pgit.sh-not-found) @@ -70,8 +70,8 @@ PURGE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/purge RELEASE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/build-release.sh /opt/jw-build/bin/build-release.sh) release-not-found) PKG_MANAGER_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pkg-manager.sh /opt/jw-build/bin/pkg-manager.sh) pkg-manager-not-found) BROWSER ?= firefox -GIT_SRV_ADMIN = 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 = 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.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 # ------------ targets @@ -181,12 +181,12 @@ git-conv-%: } check-conv: - for p in `$(GIT_SRV_ADMIN) -u jan -j list-personal-projects`; do \ + for p in `$(GIT_SRV_ADMIN_SH) -u jan -j list-personal-projects`; do \ make git-conv-$$p ;\ done list-maintainers: - $(GIT_SRV_ADMIN) $@ + $(GIT_SRV_ADMIN_SH) $@ projects.txt: echo $(PROJECTS) | sed 's/ /\n/g; s%/%%g' > $@ @@ -217,7 +217,7 @@ cvsdir.done: ssh-wrapper.sh touch $@ cvs-update.done: cvsdir.done - cvs update -dP Makefile $(shell $(CVS_ADMIN) list-projects) + cvs update -dP Makefile $(shell $(CVS_ADMIN_SH) list-projects) touch $@ update.done: purge