From 49890fd09b8b1edae3c3d16aa47ee5b75a63ce6f Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 27 Sep 2018 12:47:57 +0000 Subject: [PATCH] defs.mk: Improve HTML installation - Make LOCAL_HTML and INSTALL_HTMLDIR pre-definable via ?= - Add *.cgi to LOCAL_HTML by default Don't know if that's a good move. Will be treated as regular HTML, and, hence installed without execute permission bit set. Signed-off-by: Jan Lindemann --- make/defs.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index 12dc3be6..1c1aa1f1 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -497,12 +497,12 @@ INSTALLED_CGI += $(addprefix $(INSTALL_CGIDIR)/,$(EXE_CGI)) # -- HTML INSTALLATION_FILE_TYPES += HTML BUILD_HTMLDIR = $(TOPDIR)/htdocs -LOCAL_HTML += $(filter-out $(DONT_INSTALL),$(wildcard *.html *.css *.php *.js) $(FONTS) $(IMAGES)) +LOCAL_HTML += $(filter-out $(DONT_INSTALL),$(wildcard *.html *.css *.php *.js *.cgi) $(FONTS) $(IMAGES)) HTML_SUBDIR ?= $(shell $(PWD) | $(SED) '/.*\/htdocs\(\/\|$$\)/!d; s%.*/htdocs\(/\|$$\)%%') ifeq ($(HTML_SUBDIR),) -INSTALL_HTMLDIR = $(PROJECT_HTMLDIR) +INSTALL_HTMLDIR ?= $(PROJECT_HTMLDIR) else -INSTALL_HTMLDIR = $(PROJECT_HTMLDIR)/$(HTML_SUBDIR) +INSTALL_HTMLDIR ?= $(PROJECT_HTMLDIR)/$(HTML_SUBDIR) endif INSTALLED_HTML += $(addprefix $(INSTALL_HTMLDIR)/,$(LOCAL_HTML))