janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-19 21:27:39 +01:00
Code Activity

make: Add support for RSYSLOG_XXX installation

Browse source
This commit is contained in:
Jan Lindemann 2010-08-28 13:04:37 +00:00 • committed by Jan Lindemann
commit 7d1e22cb76
5 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/conf.mk
View file

@ -3,7 +3,7 @@ include $(MODDIR)/make/rules.mk
all: all:
clean: clean.conf 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: clean.conf:
rm -rf *.h *~ .*.swp *.done rm -rf *.h *~ .*.swp *.done

7
make/defs-dev.mk
View file

@ -15,6 +15,7 @@ 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 LOGROT_DIR ?= $(ENV_PREFIX)$(HOME)/etc/logrotate.d
RSYSLOG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/rsyslog.d
IMG_PREFIX ?= $(PREFIX) IMG_PREFIX ?= $(PREFIX)
LOG_PREFIX ?= $(PREFIX)/log LOG_PREFIX ?= $(PREFIX)/log
JAVA_PREFIX ?= $(PREFIX) JAVA_PREFIX ?= $(PREFIX)
@ -163,6 +164,12 @@ LOGROTMODE ?= $(CFGMODE)
LOGROTDIROWNER ?= $(CFGDIROWNER) LOGROTDIROWNER ?= $(CFGDIROWNER)
LOGROTDIRGROUP ?= $(CFGDIRGROUP) LOGROTDIRGROUP ?= $(CFGDIRGROUP)
LOGROTDIRMODE ?= $(CFGDIRMODE) LOGROTDIRMODE ?= $(CFGDIRMODE)
RSYSLOGOWNER ?= $(CFGOWNER)
RSYSLOGGROUP ?= $(CFGGROUP)
RSYSLOGMODE ?= $(CFGMODE)
RSYSLOGDIROWNER ?= $(CFGDIROWNER)
RSYSLOGDIRGROUP ?= $(CFGDIROWNER)
RSYSLOGDIRMODE ?= $(CFGDIRMODE)
CRONTABOWNER ?= $(CFGOWNER) CRONTABOWNER ?= $(CFGOWNER)
CRONTABGROUP ?= $(CFGGROUP) CRONTABGROUP ?= $(CFGGROUP)
CRONTABMODE ?= 600 CRONTABMODE ?= 600

7
make/defs-dist.mk
View file

@ -15,6 +15,7 @@ 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 LOGROT_DIR ?= $(ENV_PREFIX)/etc/logrotate.d
LOGROT_DIR ?= $(ENV_PREFIX)$(HOME)/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)
@ -164,6 +165,12 @@ LOGROTMODE ?= $(CFGMODE)
LOGROTDIROWNER ?= $(CFGDIROWNER) LOGROTDIROWNER ?= $(CFGDIROWNER)
LOGROTDIRGROUP ?= $(CFGDIROWNER) LOGROTDIRGROUP ?= $(CFGDIROWNER)
LOGROTDIRMODE ?= $(CFGDIRMODE) LOGROTDIRMODE ?= $(CFGDIRMODE)
RSYSLOGOWNER ?= $(CFGOWNER)
RSYSLOGGROUP ?= $(CFGGROUP)
RSYSLOGMODE ?= $(CFGMODE)
RSYSLOGDIROWNER ?= $(CFGDIROWNER)
RSYSLOGDIRGROUP ?= $(CFGDIROWNER)
RSYSLOGDIRMODE ?= $(CFGDIRMODE)
CRONTABOWNER ?= $(CFGOWNER) CRONTABOWNER ?= $(CFGOWNER)
CRONTABGROUP ?= $(CFGGROUP) CRONTABGROUP ?= $(CFGGROUP)
CRONTABMODE ?= 600 CRONTABMODE ?= 600

8
make/defs.mk
View file

@ -395,6 +395,14 @@ INSTALL_LOGROTDIR = $(LOGROT_DIR)
INSTALLED_LOGROT = $(addprefix $(INSTALL_LOGROTDIR)/,$(LOGROT)) INSTALLED_LOGROT = $(addprefix $(INSTALL_LOGROTDIR)/,$(LOGROT))
endif 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 # -- CRONTAB
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
CRONTAB += $(wildcard *.crontab) CRONTAB += $(wildcard *.crontab)

3
make/rules.mk
View file

@ -331,6 +331,9 @@ $(INSTALL_INITDIR)/%: %.init
$(INSTALL_LOGROTDIR)/%: %.logrotate $(INSTALL_LOGROTDIR)/%: %.logrotate
$(INSTALL) -o $(LOGROTOWNER) -g $(LOGROTGROUP) -m $(LOGROTMODE) $< $@ $(INSTALL) -o $(LOGROTOWNER) -g $(LOGROTGROUP) -m $(LOGROTMODE) $< $@
$(INSTALL_RSYSLOGDIR)/%: %.logrotate
$(INSTALL) -o $(RSYSLOGOWNER) -g $(RSYSLOGGROUP) -m $(RSYSLOGMODE) $< $@
%: %.sysconf %: %.sysconf
cp $< $@ cp $< $@