diff --git a/make/defs-dev.mk b/make/defs-dev.mk index 472d8edc..849909cc 100644 --- a/make/defs-dev.mk +++ b/make/defs-dev.mk @@ -14,6 +14,7 @@ CGI_DIR ?= $(PREFIX)/cgi-bin 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 IMG_PREFIX ?= $(PREFIX) LOG_PREFIX ?= $(PREFIX)/log JAVA_PREFIX ?= $(PREFIX) @@ -155,6 +156,12 @@ LD_CONFMODE ?= $(CFGMODE) LD_CONFDIROWNER ?= $(CFGDIROWNER) LD_CONFDIRGROUP ?= $(CFGDIROWNER) LD_CONFDIRMODE ?= $(CFGDIRMODE) +LOGROTOWNER ?= $(CFGOWNER) +LOGROTGROUP ?= $(CFGGROUP) +LOGROTMODE ?= $(CFGMODE) +LOGROTDIROWNER ?= $(CFGDIROWNER) +LOGROTDIRGROUP ?= $(CFGDIROWNER) +LOGROTDIRMODE ?= $(CFGDIRMODE) # -- options diff --git a/make/defs-dist.mk b/make/defs-dist.mk index 221b3bcf..28e3c7d2 100644 --- a/make/defs-dist.mk +++ b/make/defs-dist.mk @@ -14,6 +14,7 @@ CGI_DIR ?= $(ENV_PREFIX)/home/wwwrun/local/cgi-bin 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 IMG_PREFIX ?= $(PREFIX) LOG_PREFIX ?= $(ENV_PREFIX)/var/log JAVA_PREFIX ?= $(PREFIX) @@ -156,6 +157,12 @@ LD_CONFMODE ?= $(CFGMODE) LD_CONFDIROWNER ?= $(CFGDIROWNER) LD_CONFDIRGROUP ?= $(CFGDIROWNER) LD_CONFDIRMODE ?= $(CFGDIRMODE) +LOGROTOWNER ?= $(CFGOWNER) +LOGROTGROUP ?= $(CFGGROUP) +LOGROTMODE ?= $(CFGMODE) +LOGROTDIROWNER ?= $(CFGDIROWNER) +LOGROTDIRGROUP ?= $(CFGDIROWNER) +LOGROTDIRMODE ?= $(CFGDIRMODE) # -- options diff --git a/make/defs.mk b/make/defs.mk index 0456fc9f..f3ee84f0 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -355,6 +355,14 @@ INSTALL_LD_CONFDIR = $(LD_CONF_DIR) INSTALLED_LD_CONF = $(addprefix $(INSTALL_LD_CONFDIR)/,$(LD_CONF)) endif +# -- LOGROT +ifneq ($(TARGET),mingw) +LOGROT += $(basename $(wildcard *.logrotate)) +BUILD_LOGROTDIR = $(TOPDIR)/bin/logrotate.d +INSTALL_LOGROTDIR = $(LOGROT_DIR) +INSTALLED_LOGROT = $(addprefix $(INSTALL_LOGROTDIR)/,$(LOGROT)) +endif + # == ifeq ($(DEVELOPMENT),true) diff --git a/make/rules.mk b/make/rules.mk index 24cbe75f..237224f1 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -250,7 +250,8 @@ check_not_empty_$(1): fi endef -INSTALLATION_FILE_TYPES = LIB PI HDR EXE SCRIPT INIT DOC PROFILE MAKE CFG SYSCFG IMG LOG JAVA LD_CONF CGI +INSTALLATION_FILE_TYPES = LIB PI HDR EXE SCRIPT INIT DOC PROFILE MAKE CFG \ + SYSCFG IMG LOG JAVA LD_CONF CGI LOGROT #$(foreach attr,OWNER GROUP MODE,$(foreach type, $(INSTALLATION_FILE_TYPES),\ # $(eval $(call std_install_rules,$(type)$(attr))))) @@ -296,6 +297,9 @@ $(foreach type, $(INSTALLATION_FILE_TYPES), $(eval $(call std_install_rules,$(ty $(INSTALL_INITDIR)/%: %.init $(INSTALL) -o $(INITOWNER) -g $(INITGROUP) -m $(INITMODE) $< $@ +$(INSTALL_LOGROTDIR)/%: %.logrotate + $(INSTALL) -o $(LOGROTOWNER) -g $(LOGROTGROUP) -m $(LOGROTMODE) $< $@ + %: %.sysconf cp $< $@