From c5d7109aae70b5f8c184ac571b45fc8b9e4f13c0 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 11 Feb 2016 13:35:43 +0000 Subject: [PATCH] make: Add TMPL as installation file type Signed-off-by: Jan Lindemann --- make/defs-dev.mk | 7 +++++++ make/defs-dist.mk | 7 +++++++ make/defs.mk | 12 ++++++++++++ make/tmpl.mk | 8 ++++++++ 4 files changed, 34 insertions(+) create mode 100644 make/tmpl.mk diff --git a/make/defs-dev.mk b/make/defs-dev.mk index b6d7ff2e..f1e6c10b 100644 --- a/make/defs-dev.mk +++ b/make/defs-dev.mk @@ -41,6 +41,7 @@ HTML_PROJECT ?= $(patsubst www-%,%,$(PROJECT)) PROJECT_HTML_BASE_DIR ?= $(HTDOCS_PREFIX)/proj PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT) PROJECT_HTML_THEMES_DIR ?= $(PROJECT_HTML_BASE_DIR)/themes +PROJECT_TMPLDIR ?= $(PREFIX)/tmpl SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d CGI_DIR ?= $(HTDOCS_PREFIX)/cgi-bin @@ -147,6 +148,12 @@ DOCMODE ?= $(HDRMODE) DOCDIROWNER ?= $(HDRDIROWNER) DOCDIRGROUP ?= $(HDRDIRGROUP) DOCDIRMODE ?= $(HDRDIRMODE) +TMPLOWNER ?= $(DOCOWNER) +TMPLGROUP ?= $(DOCGROUP) +TMPLMODE ?= $(DOCMODE) +TMPLDIROWNER ?= $(DOCDIROWNER) +TMPLDIRGROUP ?= $(DOCDIRGROUP) +TMPLDIRMODE ?= $(DOCDIRMODE) VAROWNER ?= $(shell id -un) VARGROUP ?= $(shell id -gn) VARMODE ?= 666 diff --git a/make/defs-dist.mk b/make/defs-dist.mk index e59b6fc3..68a10ea3 100644 --- a/make/defs-dist.mk +++ b/make/defs-dist.mk @@ -41,6 +41,7 @@ HTML_PROJECT ?= $(patsubst www-%,%,$(PROJECT)) PROJECT_HTML_BASE_DIR ?= $(HTDOCS_PREFIX)/proj PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT) PROJECT_HTML_THEMES_DIR ?= $(PROJECT_HTML_BASE_DIR)/themes +PROJECT_TMPLDIR ?= $(PREFIX)/share/tmpl SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d CGI_DIR ?= $(HTDOCS_PREFIX)/cgi-bin @@ -148,6 +149,12 @@ DOCMODE ?= $(HDRMODE) DOCDIROWNER ?= $(HDRDIROWNER) DOCDIRGROUP ?= $(HDRDIROWNER) DOCDIRMODE ?= $(HDRDIRMODE) +TMPLOWNER ?= $(DOCOWNER) +TMPLGROUP ?= $(DOCGROUP) +TMPLMODE ?= $(DOCMODE) +TMPLDIROWNER ?= $(DOCDIROWNER) +TMPLDIRGROUP ?= $(DOCDIRGROUP) +TMPLDIRMODE ?= $(DOCDIRMODE) VAROWNER ?= nogroup VARGROUP ?= nobody VARMODE ?= 666 diff --git a/make/defs.mk b/make/defs.mk index f9e8e5d1..1cc92806 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -467,6 +467,18 @@ INSTALL_HTMLDIR = $(PROJECT_HTMLDIR)/$(HTML_SUBDIR) endif 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 INSTALLATION_FILE_TYPES += SYSTEMD BUILD_SYSTEMDDIR = $(TOPDIR)/bin/systemd diff --git a/make/tmpl.mk b/make/tmpl.mk new file mode 100644 index 00000000..f065d096 --- /dev/null +++ b/make/tmpl.mk @@ -0,0 +1,8 @@ +include $(MODDIR)/make/defs.mk +include $(MODDIR)/make/rules.mk + +all: +install: install_TMPL +clean: textclean localclean doneclean +test: +