diff --git a/make/conf.mk b/make/conf.mk index c4559395..c8c92a6a 100644 --- a/make/conf.mk +++ b/make/conf.mk @@ -3,7 +3,7 @@ include $(MODDIR)/make/rules.mk all: clean: clean.conf -install: install_CFG install_SYSCFG install_LOGROT install_CRONTAB $(CONF_D) +install: install_CFG install_SYSCFG install_LOGROT install_CRONTAB install_RSYSLOG $(CONF_D) clean.conf: rm -rf *.h *~ .*.swp *.done diff --git a/make/defs-dev.mk b/make/defs-dev.mk index 3a4048ed..87221d06 100644 --- a/make/defs-dev.mk +++ b/make/defs-dev.mk @@ -15,6 +15,7 @@ SYSCFG_DIR ?= $(PREFIX)/sysconfig CONFIG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT) LD_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/ld.so.conf.d LOGROT_DIR ?= $(ENV_PREFIX)$(HOME)/etc/logrotate.d +RSYSLOG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/rsyslog.d IMG_PREFIX ?= $(PREFIX) LOG_PREFIX ?= $(PREFIX)/log JAVA_PREFIX ?= $(PREFIX) @@ -163,6 +164,12 @@ LOGROTMODE ?= $(CFGMODE) LOGROTDIROWNER ?= $(CFGDIROWNER) LOGROTDIRGROUP ?= $(CFGDIRGROUP) LOGROTDIRMODE ?= $(CFGDIRMODE) +RSYSLOGOWNER ?= $(CFGOWNER) +RSYSLOGGROUP ?= $(CFGGROUP) +RSYSLOGMODE ?= $(CFGMODE) +RSYSLOGDIROWNER ?= $(CFGDIROWNER) +RSYSLOGDIRGROUP ?= $(CFGDIROWNER) +RSYSLOGDIRMODE ?= $(CFGDIRMODE) CRONTABOWNER ?= $(CFGOWNER) CRONTABGROUP ?= $(CFGGROUP) CRONTABMODE ?= 600 diff --git a/make/defs-dist.mk b/make/defs-dist.mk index ce4157c7..ca72e7a1 100644 --- a/make/defs-dist.mk +++ b/make/defs-dist.mk @@ -15,6 +15,7 @@ SYSCFG_DIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig CONFIG_DIR ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT) LD_CONF_DIR ?= $(ENV_PREFIX)/etc/ld.so.conf.d LOGROT_DIR ?= $(ENV_PREFIX)/etc/logrotate.d +LOGROT_DIR ?= $(ENV_PREFIX)$(HOME)/etc/logrotate.d IMG_PREFIX ?= $(PREFIX) LOG_PREFIX ?= $(ENV_PREFIX)/var/log JAVA_PREFIX ?= $(PREFIX) @@ -164,6 +165,12 @@ LOGROTMODE ?= $(CFGMODE) LOGROTDIROWNER ?= $(CFGDIROWNER) LOGROTDIRGROUP ?= $(CFGDIROWNER) LOGROTDIRMODE ?= $(CFGDIRMODE) +RSYSLOGOWNER ?= $(CFGOWNER) +RSYSLOGGROUP ?= $(CFGGROUP) +RSYSLOGMODE ?= $(CFGMODE) +RSYSLOGDIROWNER ?= $(CFGDIROWNER) +RSYSLOGDIRGROUP ?= $(CFGDIROWNER) +RSYSLOGDIRMODE ?= $(CFGDIRMODE) CRONTABOWNER ?= $(CFGOWNER) CRONTABGROUP ?= $(CFGGROUP) CRONTABMODE ?= 600 diff --git a/make/defs.mk b/make/defs.mk index 6cd9fdaa..e7ebf97b 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -395,6 +395,14 @@ INSTALL_LOGROTDIR = $(LOGROT_DIR) INSTALLED_LOGROT = $(addprefix $(INSTALL_LOGROTDIR)/,$(LOGROT)) endif +# -- RSYSLOG +ifneq ($(TARGET),mingw) +RSYSLOG += $(basename $(wildcard *.rsyslog)) +BUILD_RSYSLOGDIR = $(TOPDIR)/bin/logrotate.d +INSTALL_RSYSLOGDIR = $(RSYSLOG_DIR) +INSTALLED_RSYSLOG = $(addprefix $(INSTALL_RSYSLOGDIR)/,$(RSYSLOG)) +endif + # -- CRONTAB ifneq ($(TARGET),mingw) CRONTAB += $(wildcard *.crontab) diff --git a/make/rules.mk b/make/rules.mk index bc0019b1..886de3e6 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -331,6 +331,9 @@ $(INSTALL_INITDIR)/%: %.init $(INSTALL_LOGROTDIR)/%: %.logrotate $(INSTALL) -o $(LOGROTOWNER) -g $(LOGROTGROUP) -m $(LOGROTMODE) $< $@ +$(INSTALL_RSYSLOGDIR)/%: %.logrotate + $(INSTALL) -o $(RSYSLOGOWNER) -g $(RSYSLOGGROUP) -m $(RSYSLOGMODE) $< $@ + %: %.sysconf cp $< $@