From 98b170bcebcd130ad5a8bf1dd16c7f6aae9bac00 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Tue, 24 Jun 2014 19:19:41 +0000
Subject: [PATCH] make: (hopefully) added support for .site installation

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/conf.mk      | 2 +-
 make/defs-dev.mk  | 7 +++++++
 make/defs-dist.mk | 7 +++++++
 make/defs.mk      | 9 +++++++++
 make/rules.mk     | 3 +++
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/make/conf.mk b/make/conf.mk
index 0b663250..76b1efce 100644
--- a/make/conf.mk
+++ b/make/conf.mk
@@ -3,7 +3,7 @@ include $(MODDIR)/make/rules.mk
 
 all:
 clean: clean.conf
-install: install_CFG install_SYSCFG install_LOGROT install_CRONTAB install_RSYSLOG install_APACHE_CONF $(CONF_D)
+install: install_CFG install_SYSCFG install_LOGROT install_CRONTAB install_RSYSLOG install_APACHE_CONF install_SITE $(CONF_D)
 
 clean.conf:
 	rm -rf *.h *~ .*.swp *.done
diff --git a/make/defs-dev.mk b/make/defs-dev.mk
index 529bfabf..8e96c0b2 100644
--- a/make/defs-dev.mk
+++ b/make/defs-dev.mk
@@ -35,6 +35,7 @@ WORKING_DIR      ?= $(ENV_PREFIX)$(HOME)
 WORKING_DIR      ?= $(VAR_PREFIX)/lock
 JAVADIR          ?= $(JAVA_PREFIX)/share/java
 PROJECT_HTMLDIR  ?= $(HTDOCS_PREFIX)/proj/$(PROJECT)
+SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d
 CGI_DIR          ?= $(HTDOCS_PREFIX)/cgi-bin
 
 # -- misc
@@ -182,6 +183,12 @@ APACHE_CONFMODE       ?= $(CFGDIRMODE)
 APACHE_CONFDIROWNER   ?= $(CFGDIROWNER)
 APACHE_CONFDIRGROUP   ?= $(CFGDIROWNER)
 APACHE_CONFDIRMODE    ?= $(CFGDIRMODE)
+SITEOWNER        ?= $(APACHE_CONFOWNER)
+SITEGROUP        ?= $(APACHE_CONFGROUP)
+SITEMODE         ?= $(APACHE_CONFMODE)
+SITEDIROWNER     ?= $(APACHE_CONFDIROWNER)
+SITEDIRGROUP     ?= $(APACHE_CONFDIROWNER)
+SITEDIRMODE      ?= $(APACHE_CONFDIRMODE)
 RSYSLOGOWNER     ?= $(CFGOWNER)
 RSYSLOGGROUP     ?= $(CFGGROUP)
 RSYSLOGMODE      ?= $(CFGMODE)
diff --git a/make/defs-dist.mk b/make/defs-dist.mk
index 6623805e..2a2ed264 100644
--- a/make/defs-dist.mk
+++ b/make/defs-dist.mk
@@ -35,6 +35,7 @@ WORKING_DIR      ?= $(VAR_PREFIX)/coredumps
 WORKING_DIR      ?= $(VAR_PREFIX)/lock
 JAVADIR          ?= $(JAVA_PREFIX)/share/java
 PROJECT_HTMLDIR  ?= $(HTDOCS_PREFIX)/proj/$(PROJECT)
+SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d
 CGI_DIR          ?= $(HTDOCS_PREFIX)/cgi-bin
 
 # -- misc
@@ -183,6 +184,12 @@ APACHE_CONFMODE       ?= $(CFGMODE)
 APACHE_CONFDIROWNER   ?= $(CFGDIROWNER)
 APACHE_CONFDIRGROUP   ?= $(CFGDIROWNER)
 APACHE_CONFDIRMODE    ?= $(CFGDIRMODE)
+SITEOWNER        ?= $(APACHE_CONFOWNER)
+SITEGROUP        ?= $(APACHE_CONFGROUP)
+SITEMODE         ?= $(APACHE_CONFMODE)
+SITEDIROWNER     ?= $(APACHE_CONFDIROWNER)
+SITEDIRGROUP     ?= $(APACHE_CONFDIROWNER)
+SITEDIRMODE      ?= $(APACHE_CONFDIRMODE)
 RSYSLOGOWNER     ?= $(CFGOWNER)
 RSYSLOGGROUP     ?= $(CFGGROUP)
 RSYSLOGMODE      ?= $(CFGMODE)
diff --git a/make/defs.mk b/make/defs.mk
index 20f6dc90..e44f10ca 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -483,6 +483,15 @@ INSTALL_APACHE_CONFDIR  = $(APACHE_CONF_DIR)
 INSTALLED_APACHE_CONF   = $(addprefix $(INSTALL_APACHE_CONFDIR)/,$(patsubst %.apache-conf,%.conf,$(APACHE_CONF)))
 endif
 
+# -- SITE
+ifneq ($(TARGET),mingw)
+INSTALLATION_FILE_TYPES += SITE
+SITE            += $(basename $(filter-out $(DONT_INSTALL),$(wildcard *.site)))
+BUILD_SITEDIR    = $(TOPDIR)/bin/site/modules.d
+INSTALL_SITEDIR  = $(SITE_MODULES_DIR)
+INSTALLED_SITE   = $(addprefix $(INSTALL_SITEDIR)/,$(patsubst %.site,%.conf,$(SITE)))
+endif
+
 # -- RSYSLOG
 ifneq ($(TARGET),mingw)
 INSTALLATION_FILE_TYPES += RSYSLOG
diff --git a/make/rules.mk b/make/rules.mk
index c551b641..7857dda8 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -309,6 +309,9 @@ $(INSTALL_LOGROTDIR)/%: %.logrotate | install_dir_LOGROT
 $(INSTALL_APACHE_CONFDIR)/%.conf: %.apache-conf | install_dir_APACHE_CONF
 	$(INSTALL) -o $(APACHE_CONFOWNER) -g $(APACHE_CONFGROUP) -m $(APACHE_CONFMODE) $< $@
 
+$(INSTALL_SITEDIR)/%.conf: %.site | install_dir_SITE
+	$(INSTALL) -o $(SITEOWNER) -g $(SITEGROUP) -m $(SITEMODE) $< $@
+
 $(INSTALL_RSYSLOGDIR)/%.conf: %.rsyslog | install_dir_RSYSLOG
 	$(INSTALL) -o $(RSYSLOGOWNER) -g $(RSYSLOGGROUP) -m $(RSYSLOGMODE) $< $@