janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

make: Add TMPL as installation file type

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-02-11 13:35:43 +00:00
commit c5d7109aae
4 changed files with 34 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
make/defs-dev.mk
View file

@ -41,6 +41,7 @@ HTML_PROJECT ?= $(patsubst www-%,%,$(PROJECT))
PROJECT_HTML_BASE_DIR ?= $(HTDOCS_PREFIX)/proj PROJECT_HTML_BASE_DIR ?= $(HTDOCS_PREFIX)/proj
PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT) PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT)
PROJECT_HTML_THEMES_DIR ?= $(PROJECT_HTML_BASE_DIR)/themes PROJECT_HTML_THEMES_DIR ?= $(PROJECT_HTML_BASE_DIR)/themes
PROJECT_TMPLDIR ?= $(PREFIX)/tmpl
SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d
CGI_DIR ?= $(HTDOCS_PREFIX)/cgi-bin CGI_DIR ?= $(HTDOCS_PREFIX)/cgi-bin
@ -147,6 +148,12 @@ DOCMODE ?= $(HDRMODE)
DOCDIROWNER ?= $(HDRDIROWNER) DOCDIROWNER ?= $(HDRDIROWNER)
DOCDIRGROUP ?= $(HDRDIRGROUP) DOCDIRGROUP ?= $(HDRDIRGROUP)
DOCDIRMODE ?= $(HDRDIRMODE) DOCDIRMODE ?= $(HDRDIRMODE)
TMPLOWNER ?= $(DOCOWNER)
TMPLGROUP ?= $(DOCGROUP)
TMPLMODE ?= $(DOCMODE)
TMPLDIROWNER ?= $(DOCDIROWNER)
TMPLDIRGROUP ?= $(DOCDIRGROUP)
TMPLDIRMODE ?= $(DOCDIRMODE)
VAROWNER ?= $(shell id -un) VAROWNER ?= $(shell id -un)
VARGROUP ?= $(shell id -gn) VARGROUP ?= $(shell id -gn)
VARMODE ?= 666 VARMODE ?= 666

7
make/defs-dist.mk
View file

@ -41,6 +41,7 @@ HTML_PROJECT ?= $(patsubst www-%,%,$(PROJECT))
PROJECT_HTML_BASE_DIR ?= $(HTDOCS_PREFIX)/proj PROJECT_HTML_BASE_DIR ?= $(HTDOCS_PREFIX)/proj
PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT) PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT)
PROJECT_HTML_THEMES_DIR ?= $(PROJECT_HTML_BASE_DIR)/themes PROJECT_HTML_THEMES_DIR ?= $(PROJECT_HTML_BASE_DIR)/themes
PROJECT_TMPLDIR ?= $(PREFIX)/share/tmpl
SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d
CGI_DIR ?= $(HTDOCS_PREFIX)/cgi-bin CGI_DIR ?= $(HTDOCS_PREFIX)/cgi-bin
@ -148,6 +149,12 @@ DOCMODE ?= $(HDRMODE)
DOCDIROWNER ?= $(HDRDIROWNER) DOCDIROWNER ?= $(HDRDIROWNER)
DOCDIRGROUP ?= $(HDRDIROWNER) DOCDIRGROUP ?= $(HDRDIROWNER)
DOCDIRMODE ?= $(HDRDIRMODE) DOCDIRMODE ?= $(HDRDIRMODE)
TMPLOWNER ?= $(DOCOWNER)
TMPLGROUP ?= $(DOCGROUP)
TMPLMODE ?= $(DOCMODE)
TMPLDIROWNER ?= $(DOCDIROWNER)
TMPLDIRGROUP ?= $(DOCDIRGROUP)
TMPLDIRMODE ?= $(DOCDIRMODE)
VAROWNER ?= nogroup VAROWNER ?= nogroup
VARGROUP ?= nobody VARGROUP ?= nobody
VARMODE ?= 666 VARMODE ?= 666

12
make/defs.mk
View file

@ -467,6 +467,18 @@ INSTALL_HTMLDIR = $(PROJECT_HTMLDIR)/$(HTML_SUBDIR)
endif endif
INSTALLED_HTML += $(addprefix $(INSTALL_HTMLDIR)/,$(LOCAL_HTML)) INSTALLED_HTML += $(addprefix $(INSTALL_HTMLDIR)/,$(LOCAL_HTML))
# -- TMPL
INSTALLATION_FILE_TYPES += TMPL
BUILD_TMPLDIR = $(TOPDIR)/tmpl
LOCAL_TMPL += $(filter-out $(DONT_INSTALL) Makefile,$(wildcard *.tmpl))
TMPL_SUBDIR ?= $(shell pwd | $(SED) '/.*\/tmpl\(\/\|$$\)/!d; s%.*/tmpl\(/\|$$\)%%')
ifeq ($(TMPL_SUBDIR),)
INSTALL_TMPLDIR = $(PROJECT_TMPLDIR)
else
INSTALL_TMPLDIR = $(PROJECT_TMPLDIR)/$(TMPL_SUBDIR)
endif
INSTALLED_TMPL += $(addprefix $(INSTALL_TMPLDIR)/,$(LOCAL_TMPL))
# -- SYSTEMD # -- SYSTEMD
INSTALLATION_FILE_TYPES += SYSTEMD INSTALLATION_FILE_TYPES += SYSTEMD
BUILD_SYSTEMDDIR = $(TOPDIR)/bin/systemd BUILD_SYSTEMDDIR = $(TOPDIR)/bin/systemd

8
make/tmpl.mk Normal file
View file

@ -0,0 +1,8 @@
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/rules.mk
all:
install: install_TMPL
clean: textclean localclean doneclean
test: