janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-24 22:50:39 +01:00
Code Activity

make: Add support for LOGROT installation type (/etc/logrotate.d/)

Browse source
This commit is contained in:
Jan Lindemann 2009-03-10 15:56:01 +00:00 • committed by Jan Lindemann
commit 9966c55335
4 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
make/defs-dev.mk
View file

@ -14,6 +14,7 @@ CGI_DIR ?= $(PREFIX)/cgi-bin
SYSCFG_DIR ?= $(PREFIX)/sysconfig SYSCFG_DIR ?= $(PREFIX)/sysconfig
CONFIG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT) CONFIG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT)
LD_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/ld.so.conf.d LD_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/ld.so.conf.d
LOGROT_DIR ?= $(ENV_PREFIX)$(HOME)/etc/logrotate.d
IMG_PREFIX ?= $(PREFIX) IMG_PREFIX ?= $(PREFIX)
LOG_PREFIX ?= $(PREFIX)/log LOG_PREFIX ?= $(PREFIX)/log
JAVA_PREFIX ?= $(PREFIX) JAVA_PREFIX ?= $(PREFIX)
@ -155,6 +156,12 @@ LD_CONFMODE ?= $(CFGMODE)
LD_CONFDIROWNER ?= $(CFGDIROWNER) LD_CONFDIROWNER ?= $(CFGDIROWNER)
LD_CONFDIRGROUP ?= $(CFGDIROWNER) LD_CONFDIRGROUP ?= $(CFGDIROWNER)
LD_CONFDIRMODE ?= $(CFGDIRMODE) LD_CONFDIRMODE ?= $(CFGDIRMODE)
LOGROTOWNER ?= $(CFGOWNER)
LOGROTGROUP ?= $(CFGGROUP)
LOGROTMODE ?= $(CFGMODE)
LOGROTDIROWNER ?= $(CFGDIROWNER)
LOGROTDIRGROUP ?= $(CFGDIROWNER)
LOGROTDIRMODE ?= $(CFGDIRMODE)
# -- options # -- options

7
make/defs-dist.mk
View file

@ -14,6 +14,7 @@ CGI_DIR ?= $(ENV_PREFIX)/home/wwwrun/local/cgi-bin
SYSCFG_DIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig SYSCFG_DIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig
CONFIG_DIR ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT) CONFIG_DIR ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT)
LD_CONF_DIR ?= $(ENV_PREFIX)/etc/ld.so.conf.d LD_CONF_DIR ?= $(ENV_PREFIX)/etc/ld.so.conf.d
LOGROT_DIR ?= $(ENV_PREFIX)/etc/logrotate.d
IMG_PREFIX ?= $(PREFIX) IMG_PREFIX ?= $(PREFIX)
LOG_PREFIX ?= $(ENV_PREFIX)/var/log LOG_PREFIX ?= $(ENV_PREFIX)/var/log
JAVA_PREFIX ?= $(PREFIX) JAVA_PREFIX ?= $(PREFIX)
@ -156,6 +157,12 @@ LD_CONFMODE ?= $(CFGMODE)
LD_CONFDIROWNER ?= $(CFGDIROWNER) LD_CONFDIROWNER ?= $(CFGDIROWNER)
LD_CONFDIRGROUP ?= $(CFGDIROWNER) LD_CONFDIRGROUP ?= $(CFGDIROWNER)
LD_CONFDIRMODE ?= $(CFGDIRMODE) LD_CONFDIRMODE ?= $(CFGDIRMODE)
LOGROTOWNER ?= $(CFGOWNER)
LOGROTGROUP ?= $(CFGGROUP)
LOGROTMODE ?= $(CFGMODE)
LOGROTDIROWNER ?= $(CFGDIROWNER)
LOGROTDIRGROUP ?= $(CFGDIROWNER)
LOGROTDIRMODE ?= $(CFGDIRMODE)
# -- options # -- options

8
make/defs.mk
View file

@ -355,6 +355,14 @@ INSTALL_LD_CONFDIR = $(LD_CONF_DIR)
INSTALLED_LD_CONF = $(addprefix $(INSTALL_LD_CONFDIR)/,$(LD_CONF)) INSTALLED_LD_CONF = $(addprefix $(INSTALL_LD_CONFDIR)/,$(LD_CONF))
endif 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) ifeq ($(DEVELOPMENT),true)

6
make/rules.mk
View file

@ -250,7 +250,8 @@ check_not_empty_$(1):
fi fi
endef 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),\ #$(foreach attr,OWNER GROUP MODE,$(foreach type, $(INSTALLATION_FILE_TYPES),\
# $(eval $(call std_install_rules,$(type)$(attr))))) # $(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_INITDIR)/%: %.init
$(INSTALL) -o $(INITOWNER) -g $(INITGROUP) -m $(INITMODE) $< $@ $(INSTALL) -o $(INITOWNER) -g $(INITGROUP) -m $(INITMODE) $< $@
$(INSTALL_LOGROTDIR)/%: %.logrotate
$(INSTALL) -o $(LOGROTOWNER) -g $(LOGROTGROUP) -m $(LOGROTMODE) $< $@
%: %.sysconf %: %.sysconf
cp $< $@ cp $< $@