From d0ff050ce1ac9b3ef42a56655a9147825e09d68f Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 8 Jul 2010 18:56:28 +0000 Subject: [PATCH] upload.mk: Add variables UPLOAD_MODULE_PATH and UPLOAD_FILE_ROOT --- make/upload.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/make/upload.mk b/make/upload.mk index 74abfdc6..fd1937f7 100644 --- a/make/upload.mk +++ b/make/upload.mk @@ -8,8 +8,9 @@ UPLOAD_USER ?= $(shell id -nu) UPLOAD_HOST_LOGIN ?= root UPLOAD_HOST ?= www.jannet.de UPLOAD_VHOST_ROOT ?= /srv/www/htdocs/jannet.de_443 -UPLOAD_SERVER_PATH ?= proj/$(UPLOAD_MODULE) -UPLOAD_FILE_ROOT ?= $(UPLOAD_VHOST_ROOT)/proj/$(UPLOAD_MODULE) +#UPLOAD_TEST_PREFIX ?= +UPLOAD_MODULE_PATH ?= $(UPLOAD_TEST_PREFIX)proj/$(UPLOAD_MODULE) +UPLOAD_FILE_ROOT ?= $(UPLOAD_VHOST_ROOT)/$(UPLOAD_MODULE_PATH) UPLOAD_TARGET_PREFIX ?= rsync_ssh://$(UPLOAD_HOST_LOGIN)@$(UPLOAD_HOST):$(UPLOAD_FILE_ROOT)/ UPLOAD_LAST_VERSION_FILE ?= LAST_UPLOADED_VERSION UPLOAD_LAST_VERSION ?= $(shell cat $(UPLOAD_LAST_VERSION_FILE) 2>/dev/null)