From 1a25b5ae597dbcd23eb0cb6ea0fb6b019b4897db Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 18 Jun 2014 10:33:50 +0000 Subject: [PATCH] fix: HTML_SUBDIR doesn\'t wasn't correctly computed as empty directly below htdocs Signed-off-by: Jan Lindemann --- make/defs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/defs.mk b/make/defs.mk index 8b161c2e..1f175b9e 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -402,7 +402,7 @@ INSTALLED_CGI += $(addprefix $(INSTALL_CGIDIR)/,$(EXE_CGI)) INSTALLATION_FILE_TYPES += HTML BUILD_HTMLDIR = $(TOPDIR)/htdocs LOCAL_HTML += $(filter-out $(DONT_INSTALL),$(wildcard *.html *.css *.php) $(IMAGES)) -HTML_SUBDIR ?= $(shell pwd | $(SED) 's%.*/htdocs/%%') +HTML_SUBDIR ?= $(shell pwd | $(SED) 's%.*/htdocs\(/\|$$\)%%') ifeq ($(HTML_SUBDIR),) INSTALL_HTMLDIR = $(PROJECT_HTMLDIR) else