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

defs.mk, rules.mk: Completed apache-conf installation rules

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2014-06-18 22:13:59 +00:00
commit 22cb913a87
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/defs.mk
View file

@ -480,7 +480,7 @@ INSTALLATION_FILE_TYPES += APACHE_CONF
APACHE_CONF += $(basename $(filter-out $(DONT_INSTALL),$(wildcard *.apache-conf))) APACHE_CONF += $(basename $(filter-out $(DONT_INSTALL),$(wildcard *.apache-conf)))
BUILD_APACHE_CONFDIR = $(TOPDIR)/bin/apache/conf.d BUILD_APACHE_CONFDIR = $(TOPDIR)/bin/apache/conf.d
INSTALL_APACHE_CONFDIR = $(APACHE_CONF_DIR) INSTALL_APACHE_CONFDIR = $(APACHE_CONF_DIR)
INSTALLED_APACHE_CONF = $(addprefix $(INSTALL_APACHE_CONFDIR)/,$(APACHE_CONF)) INSTALLED_APACHE_CONF = $(addprefix $(INSTALL_APACHE_CONFDIR)/,(patsubst %.apache-conf,%.conf,$(APACHE_CONF)))
endif endif
# -- RSYSLOG # -- RSYSLOG

3
make/rules.mk
View file

@ -303,6 +303,9 @@ $(INSTALL_INITDIR)/%: %.init | install_dir_INIT
$(INSTALL_LOGROTDIR)/%: %.logrotate | install_dir_LOGROT $(INSTALL_LOGROTDIR)/%: %.logrotate | install_dir_LOGROT
$(INSTALL) -o $(LOGROTOWNER) -g $(LOGROTGROUP) -m $(LOGROTMODE) $< $@ $(INSTALL) -o $(LOGROTOWNER) -g $(LOGROTGROUP) -m $(LOGROTMODE) $< $@
$(INSTALL_APACHE_CONFDIR)/%: %.apache-conf | install_dir_APACHE_CONF
$(INSTALL) -o $(APACHE_CONFOWNER) -g $(APACHE_CONFGROUP) -m $(APACHE_CONFMODE) $< $@
$(INSTALL_RSYSLOGDIR)/%.conf: %.rsyslog | install_dir_RSYSLOG $(INSTALL_RSYSLOGDIR)/%.conf: %.rsyslog | install_dir_RSYSLOG
$(INSTALL) -o $(RSYSLOGOWNER) -g $(RSYSLOGGROUP) -m $(RSYSLOGMODE) $< $@ $(INSTALL) -o $(RSYSLOGOWNER) -g $(RSYSLOGGROUP) -m $(RSYSLOGMODE) $< $@