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-dist.mk, rules.mk: Fix some APACHE_CONF installation variables and rules

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2014-06-24 15:53:37 +00:00
commit 9e6d2f1ae3
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/defs-dist.mk
View file

@ -179,7 +179,7 @@ LOGROTDIRGROUP ?= $(CFGDIROWNER)
LOGROTDIRMODE ?= $(CFGDIRMODE) LOGROTDIRMODE ?= $(CFGDIRMODE)
APACHE_CONFOWNER ?= $(CFGOWNER) APACHE_CONFOWNER ?= $(CFGOWNER)
APACHE_CONFGROUP ?= $(CFGGROUP) APACHE_CONFGROUP ?= $(CFGGROUP)
APACHE_CONFMODE ?= $(CFGDIRMODE) APACHE_CONFMODE ?= $(CFGMODE)
APACHE_CONFDIROWNER ?= $(CFGDIROWNER) APACHE_CONFDIROWNER ?= $(CFGDIROWNER)
APACHE_CONFDIRGROUP ?= $(CFGDIROWNER) APACHE_CONFDIRGROUP ?= $(CFGDIROWNER)
APACHE_CONFDIRMODE ?= $(CFGDIRMODE) APACHE_CONFDIRMODE ?= $(CFGDIRMODE)

2
make/rules.mk
View file

@ -306,7 +306,7 @@ $(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_APACHE_CONFDIR)/%.conf: %.apache-conf | install_dir_APACHE_CONF
$(INSTALL) -o $(APACHE_CONFOWNER) -g $(APACHE_CONFGROUP) -m $(APACHE_CONFMODE) $< $@ $(INSTALL) -o $(APACHE_CONFOWNER) -g $(APACHE_CONFGROUP) -m $(APACHE_CONFMODE) $< $@
$(INSTALL_RSYSLOGDIR)/%.conf: %.rsyslog | install_dir_RSYSLOG $(INSTALL_RSYSLOGDIR)/%.conf: %.rsyslog | install_dir_RSYSLOG