diff --git a/make/defs.mk b/make/defs.mk index 1f175b9e..76252314 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -480,7 +480,7 @@ 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)) +INSTALLED_APACHE_CONF = $(addprefix $(INSTALL_APACHE_CONFDIR)/,(patsubst %.apache-conf,%.conf,$(APACHE_CONF))) endif # -- RSYSLOG diff --git a/make/rules.mk b/make/rules.mk index 780d780b..5774c614 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -303,6 +303,9 @@ $(INSTALL_INITDIR)/%: %.init | install_dir_INIT $(INSTALL_LOGROTDIR)/%: %.logrotate | install_dir_LOGROT $(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) -o $(RSYSLOGOWNER) -g $(RSYSLOGGROUP) -m $(RSYSLOGMODE) $< $@