janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-23 06:30:38 +01:00
Code Activity

defs-dev.mk, defs-dist.mk, defs.mk: Add support for installation type .apache-conf

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2014-06-17 13:02:05 +00:00
commit a8e259870b
3 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
make/defs-dev.mk
View file

@ -16,6 +16,7 @@ SYSCFG_DIR ?= $(PREFIX)/sysconfig
CONFIG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME) CONFIG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME)
LD_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/ld.so.conf.d LD_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/ld.so.conf.d
LOGROT_DIR ?= $(ENV_PREFIX)$(HOME)/etc/logrotate.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 RSYSLOG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/rsyslog.d
IMG_PREFIX ?= $(PREFIX) IMG_PREFIX ?= $(PREFIX)
LOG_PREFIX ?= $(PREFIX)/log LOG_PREFIX ?= $(PREFIX)/log
@ -175,6 +176,12 @@ LOGROTMODE ?= 644 # group writable files are ignored by logrotate
LOGROTDIROWNER ?= $(CFGDIROWNER) LOGROTDIROWNER ?= $(CFGDIROWNER)
LOGROTDIRGROUP ?= $(CFGDIRGROUP) LOGROTDIRGROUP ?= $(CFGDIRGROUP)
LOGROTDIRMODE ?= $(CFGDIRMODE) LOGROTDIRMODE ?= $(CFGDIRMODE)
APACHE_CONFOWNER ?= $(CFGOWNER)
APACHE_CONFGROUP ?= $(CFGGROUP)
APACHE_CONFMODE ?= $(CFGDIRMODE)
APACHE_CONFDIROWNER ?= $(CFGDIROWNER)
APACHE_CONFDIRGROUP ?= $(CFGDIROWNER)
APACHE_CONFDIRMODE ?= $(CFGDIRMODE)
RSYSLOGOWNER ?= $(CFGOWNER) RSYSLOGOWNER ?= $(CFGOWNER)
RSYSLOGGROUP ?= $(CFGGROUP) RSYSLOGGROUP ?= $(CFGGROUP)
RSYSLOGMODE ?= $(CFGMODE) RSYSLOGMODE ?= $(CFGMODE)

7
make/defs-dist.mk
View file

@ -16,6 +16,7 @@ SYSCFG_DIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig
CONFIG_DIR ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME) CONFIG_DIR ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME)
LD_CONF_DIR ?= $(ENV_PREFIX)/etc/ld.so.conf.d LD_CONF_DIR ?= $(ENV_PREFIX)/etc/ld.so.conf.d
LOGROT_DIR ?= $(ENV_PREFIX)/etc/logrotate.d LOGROT_DIR ?= $(ENV_PREFIX)/etc/logrotate.d
APACHE_CONF_DIR ?= $(ENV_PREFIX)/etc/apache2/conf.d
RSYSLOG_DIR ?= $(ENV_PREFIX)/etc/rsyslog.d RSYSLOG_DIR ?= $(ENV_PREFIX)/etc/rsyslog.d
IMG_PREFIX ?= $(PREFIX) IMG_PREFIX ?= $(PREFIX)
LOG_PREFIX ?= $(ENV_PREFIX)/var/log LOG_PREFIX ?= $(ENV_PREFIX)/var/log
@ -176,6 +177,12 @@ LOGROTMODE ?= 644 # group writable files are ignored by logrotate
LOGROTDIROWNER ?= $(CFGDIROWNER) LOGROTDIROWNER ?= $(CFGDIROWNER)
LOGROTDIRGROUP ?= $(CFGDIROWNER) LOGROTDIRGROUP ?= $(CFGDIROWNER)
LOGROTDIRMODE ?= $(CFGDIRMODE) LOGROTDIRMODE ?= $(CFGDIRMODE)
APACHE_CONFOWNER ?= $(CFGOWNER)
APACHE_CONFGROUP ?= $(CFGGROUP)
APACHE_CONFMODE ?= $(CFGDIRMODE)
APACHE_CONFDIROWNER ?= $(CFGDIROWNER)
APACHE_CONFDIRGROUP ?= $(CFGDIROWNER)
APACHE_CONFDIRMODE ?= $(CFGDIRMODE)
RSYSLOGOWNER ?= $(CFGOWNER) RSYSLOGOWNER ?= $(CFGOWNER)
RSYSLOGGROUP ?= $(CFGGROUP) RSYSLOGGROUP ?= $(CFGGROUP)
RSYSLOGMODE ?= $(CFGMODE) RSYSLOGMODE ?= $(CFGMODE)

9
make/defs.mk
View file

@ -474,6 +474,15 @@ INSTALL_LOGROTDIR = $(LOGROT_DIR)
INSTALLED_LOGROT = $(addprefix $(INSTALL_LOGROTDIR)/,$(LOGROT)) INSTALLED_LOGROT = $(addprefix $(INSTALL_LOGROTDIR)/,$(LOGROT))
endif 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 # -- RSYSLOG
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
INSTALLATION_FILE_TYPES += RSYSLOG INSTALLATION_FILE_TYPES += RSYSLOG