janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-18 21:13:56 +01:00
Code Activity

defs.mk: Fix htdocs variables IMAGES and HTML_SUBDIR

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-02-11 11:04:16 +00:00
commit e11afe1154
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/defs.mk
View file

@ -313,7 +313,7 @@ ALL_CSRC += $(LOCAL_CSRC) $(PREREQ_CSRC)
PUBLIC_PATH_DEVEL_DOC = /proj/devel-docs PUBLIC_PATH_DEVEL_DOC = /proj/devel-docs
UPLOAD_URL_DEVEL_DOC = rsync_ssh://root@feitnix.jannet.de:/srv/www/htdocs/jannet.de_443/$(PUBLIC_PATH_DEVEL_DOC) UPLOAD_URL_DEVEL_DOC = rsync_ssh://root@feitnix.jannet.de:/srv/www/htdocs/jannet.de_443/$(PUBLIC_PATH_DEVEL_DOC)
IMAGES += $(wildcard *.png *.jpg *.bmp *.gif *.ico) IMAGES += $(wildcard *.png *.jpg *.bmp *.gif *.ico *.svg)
# -- standard dirs and files for build and install # -- standard dirs and files for build and install
@ -459,7 +459,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) '/.*\/htdocs\(\/\|$$\)/!d; s%.*/htdocs\(/\|$$\)%%')
ifeq ($(HTML_SUBDIR),) ifeq ($(HTML_SUBDIR),)
INSTALL_HTMLDIR = $(PROJECT_HTMLDIR) INSTALL_HTMLDIR = $(PROJECT_HTMLDIR)
else else