From 4bbc2206e59ec99c4aaa00288d592e61633a2b6b Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 7 Apr 2015 13:18:00 +0000 Subject: [PATCH] defs-dist.mk and defs-dev.mk: HTML_PROJECT now defaults to PROJECT without www- prefix. Signed-off-by: Jan Lindemann --- make/defs-dev.mk | 2 +- make/defs-dist.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/make/defs-dev.mk b/make/defs-dev.mk index c975dd42..8652ad49 100644 --- a/make/defs-dev.mk +++ b/make/defs-dev.mk @@ -35,7 +35,7 @@ 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) +HTML_PROJECT ?= $(patsubst www-%,%,$(PROJECT)) PROJECT_HTML_BASE_DIR ?= $(HTDOCS_PREFIX)/proj PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT) PROJECT_HTML_THEMES_DIR ?= $(PROJECT_HTML_BASE_DIR)/themes diff --git a/make/defs-dist.mk b/make/defs-dist.mk index 22dfe067..7237648f 100644 --- a/make/defs-dist.mk +++ b/make/defs-dist.mk @@ -35,7 +35,7 @@ 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) +HTML_PROJECT ?= $(patsubst www-%,%,$(PROJECT)) PROJECT_HTML_BASE_DIR ?= $(HTDOCS_PREFIX)/proj PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT) PROJECT_HTML_THEMES_DIR ?= $(PROJECT_HTML_BASE_DIR)/themes