From a8e259870bcf26d3b422c72238e3b2fb7f69ea82 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Tue, 17 Jun 2014 13:02:05 +0000
Subject: [PATCH] defs-dev.mk, defs-dist.mk, defs.mk: Add support for
 installation type .apache-conf

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/defs-dev.mk  | 7 +++++++
 make/defs-dist.mk | 7 +++++++
 make/defs.mk      | 9 +++++++++
 3 files changed, 23 insertions(+)

diff --git a/make/defs-dev.mk b/make/defs-dev.mk
index c558f5ce..4ab3f3bb 100644
--- a/make/defs-dev.mk
+++ b/make/defs-dev.mk
@@ -16,6 +16,7 @@ SYSCFG_DIR       ?= $(PREFIX)/sysconfig
 CONFIG_DIR       ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME)
 LD_CONF_DIR      ?= $(ENV_PREFIX)$(HOME)/etc/ld.so.conf.d
 LOGROT_DIR       ?= $(ENV_PREFIX)$(HOME)/etc/logrotate.d
+APACHE_CONF_DIR  ?= $(ENV_PREFIX)$(HOME)/etc/apache/conf.d
 RSYSLOG_DIR      ?= $(ENV_PREFIX)$(HOME)/etc/rsyslog.d
 IMG_PREFIX       ?= $(PREFIX)
 LOG_PREFIX       ?= $(PREFIX)/log
@@ -175,6 +176,12 @@ LOGROTMODE       ?= 644 # group writable files are ignored by logrotate
 LOGROTDIROWNER   ?= $(CFGDIROWNER)
 LOGROTDIRGROUP   ?= $(CFGDIRGROUP)
 LOGROTDIRMODE    ?= $(CFGDIRMODE)
+APACHE_CONFOWNER      ?= $(CFGOWNER)
+APACHE_CONFGROUP      ?= $(CFGGROUP)
+APACHE_CONFMODE       ?= $(CFGDIRMODE)
+APACHE_CONFDIROWNER   ?= $(CFGDIROWNER)
+APACHE_CONFDIRGROUP   ?= $(CFGDIROWNER)
+APACHE_CONFDIRMODE    ?= $(CFGDIRMODE)
 RSYSLOGOWNER     ?= $(CFGOWNER)
 RSYSLOGGROUP     ?= $(CFGGROUP)
 RSYSLOGMODE      ?= $(CFGMODE)
diff --git a/make/defs-dist.mk b/make/defs-dist.mk
index ca1e13f7..0267218d 100644
--- a/make/defs-dist.mk
+++ b/make/defs-dist.mk
@@ -16,6 +16,7 @@ SYSCFG_DIR       ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig
 CONFIG_DIR       ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME)
 LD_CONF_DIR      ?= $(ENV_PREFIX)/etc/ld.so.conf.d
 LOGROT_DIR       ?= $(ENV_PREFIX)/etc/logrotate.d
+APACHE_CONF_DIR  ?= $(ENV_PREFIX)/etc/apache2/conf.d
 RSYSLOG_DIR      ?= $(ENV_PREFIX)/etc/rsyslog.d
 IMG_PREFIX       ?= $(PREFIX)
 LOG_PREFIX       ?= $(ENV_PREFIX)/var/log
@@ -176,6 +177,12 @@ LOGROTMODE       ?= 644 # group writable files are ignored by logrotate
 LOGROTDIROWNER   ?= $(CFGDIROWNER)
 LOGROTDIRGROUP   ?= $(CFGDIROWNER)
 LOGROTDIRMODE    ?= $(CFGDIRMODE)
+APACHE_CONFOWNER      ?= $(CFGOWNER)
+APACHE_CONFGROUP      ?= $(CFGGROUP)
+APACHE_CONFMODE       ?= $(CFGDIRMODE)
+APACHE_CONFDIROWNER   ?= $(CFGDIROWNER)
+APACHE_CONFDIRGROUP   ?= $(CFGDIROWNER)
+APACHE_CONFDIRMODE    ?= $(CFGDIRMODE)
 RSYSLOGOWNER     ?= $(CFGOWNER)
 RSYSLOGGROUP     ?= $(CFGGROUP)
 RSYSLOGMODE      ?= $(CFGMODE)
diff --git a/make/defs.mk b/make/defs.mk
index 16570b41..8b161c2e 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -474,6 +474,15 @@ INSTALL_LOGROTDIR  = $(LOGROT_DIR)
 INSTALLED_LOGROT   = $(addprefix $(INSTALL_LOGROTDIR)/,$(LOGROT))
 endif
 
+# -- APACHE_CONF
+ifneq ($(TARGET),mingw)
+INSTALLATION_FILE_TYPES += APACHE_CONF
+APACHE_CONF            += $(basename $(filter-out $(DONT_INSTALL),$(wildcard *.apache-conf)))
+BUILD_APACHE_CONFDIR    = $(TOPDIR)/bin/apache/conf.d
+INSTALL_APACHE_CONFDIR  = $(APACHE_CONF_DIR)
+INSTALLED_APACHE_CONF   = $(addprefix $(INSTALL_APACHE_CONFDIR)/,$(APACHE_CONF))
+endif
+
 # -- RSYSLOG
 ifneq ($(TARGET),mingw)
 INSTALLATION_FILE_TYPES += RSYSLOG