From 518855db43554611e82246cb3a5108ed40b2e41a Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 21 Apr 2018 10:33:28 +0000 Subject: [PATCH] defs-dev.mk, defs-dist.mk: HTML_PROJECT from PROJECT_DIRNAME Define HTML_PROJECT from $(PROJECT_DIRNAME), not from $(PROJECT). 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 b679e0fd..848ccdf5 100644 --- a/make/defs-dev.mk +++ b/make/defs-dev.mk @@ -39,7 +39,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 ?= $(patsubst www-%,%,$(PROJECT)) +HTML_PROJECT ?= $(patsubst www-%,%,$(PROJECT_DIRNAME)) 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 d2df46e1..030bf6a0 100644 --- a/make/defs-dist.mk +++ b/make/defs-dist.mk @@ -39,7 +39,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 ?= $(patsubst www-%,%,$(PROJECT)) +HTML_PROJECT ?= $(patsubst www-%,%,$(PROJECT_DIRNAME)) PROJECT_HTML_BASE_DIR ?= $(HTDOCS_PREFIX)/proj PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT) PROJECT_HTML_THEMES_DIR ?= $(PROJECT_HTML_BASE_DIR)/themes