From 96de2faadeda9d79d0986c215a58fafb09a59c12 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 25 Jun 2014 12:46:40 +0000 Subject: [PATCH] defs-[dev|dist].mk: Add PROJECT_HTML_[BASE|THEMES]_DIR Add variables PROJECT_HTML_BASE_DIR and PROJECT_HTML_THEMES_DIR. Signed-off-by: Jan Lindemann --- make/defs-dev.mk | 4 +++- make/defs-dist.mk | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/make/defs-dev.mk b/make/defs-dev.mk index 8e96c0b2..659f0568 100644 --- a/make/defs-dev.mk +++ b/make/defs-dev.mk @@ -34,7 +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 -PROJECT_HTMLDIR ?= $(HTDOCS_PREFIX)/proj/$(PROJECT) +PROJECT_HTML_BASE_DIR ?= $(HTDOCS_PREFIX)/proj +PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(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 2a2ed264..02545b7e 100644 --- a/make/defs-dist.mk +++ b/make/defs-dist.mk @@ -34,7 +34,10 @@ 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 -PROJECT_HTMLDIR ?= $(HTDOCS_PREFIX)/proj/$(PROJECT) +PROJECT_HTML_BASE_DIR ?= $(HTDOCS_PREFIX)/proj +PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(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 CGI_DIR ?= $(HTDOCS_PREFIX)/cgi-bin