janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-22 14:10:39 +01:00
Code Activity

fix: HTML_SUBDIR doesn\'t wasn't correctly computed as empty directly below htdocs

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2014-06-18 10:33:50 +00:00
commit 1a25b5ae59
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/defs.mk
View file

@ -402,7 +402,7 @@ INSTALLED_CGI += $(addprefix $(INSTALL_CGIDIR)/,$(EXE_CGI))
INSTALLATION_FILE_TYPES += HTML INSTALLATION_FILE_TYPES += HTML
BUILD_HTMLDIR = $(TOPDIR)/htdocs BUILD_HTMLDIR = $(TOPDIR)/htdocs
LOCAL_HTML += $(filter-out $(DONT_INSTALL),$(wildcard *.html *.css *.php) $(IMAGES)) 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),) ifeq ($(HTML_SUBDIR),)
INSTALL_HTMLDIR = $(PROJECT_HTMLDIR) INSTALL_HTMLDIR = $(PROJECT_HTMLDIR)
else else