From 0eb6520a66eed0ca70be8a9b541dc1539c9a882b Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 25 Jun 2014 13:47:58 +0000 Subject: [PATCH] defs-dev.mk, defs-dist.mk: Add variable HTML_PROJECT Signed-off-by: Jan Lindemann --- make/defs-dev.mk | 3 ++- make/defs-dist.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/make/defs-dev.mk b/make/defs-dev.mk index 659f0568..4c30eb0a 100644 --- a/make/defs-dev.mk +++ b/make/defs-dev.mk @@ -34,8 +34,9 @@ DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443 WORKING_DIR ?= $(ENV_PREFIX)$(HOME) WORKING_DIR ?= $(VAR_PREFIX)/lock JAVADIR ?= $(JAVA_PREFIX)/share/java +HTML_PROJECT ?= $(PROJECT) PROJECT_HTML_BASE_DIR ?= $(HTDOCS_PREFIX)/proj -PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(PROJECT) +PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT) PROJECT_HTML_THEMES_DIR ?= $(PROJECT_HTML_BASE_DIR)/themes SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d CGI_DIR ?= $(HTDOCS_PREFIX)/cgi-bin diff --git a/make/defs-dist.mk b/make/defs-dist.mk index 02545b7e..28ee8bd9 100644 --- a/make/defs-dist.mk +++ b/make/defs-dist.mk @@ -34,8 +34,9 @@ DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443 WORKING_DIR ?= $(VAR_PREFIX)/coredumps WORKING_DIR ?= $(VAR_PREFIX)/lock JAVADIR ?= $(JAVA_PREFIX)/share/java +HTML_PROJECT ?= $(PROJECT) PROJECT_HTML_BASE_DIR ?= $(HTDOCS_PREFIX)/proj -PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(PROJECT) +PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT) PROJECT_HTML_THEMES_DIR ?= $(PROJECT_HTML_BASE_DIR)/themes PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(PROJECT) SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d