From dba01ffe0f088ee703c4389cfe78469f07830e93 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 10 Jun 2010 10:00:29 +0000 Subject: [PATCH] make: Add support for .crontab files --- make/conf.mk | 2 +- make/defs-dev.mk | 7 +++++++ make/defs-dist.mk | 7 +++++++ make/defs.mk | 7 +++++++ make/rules.mk | 2 +- 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/make/conf.mk b/make/conf.mk index f7297f50..c4559395 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 $(CONF_D) +install: install_CFG install_SYSCFG install_LOGROT install_CRONTAB $(CONF_D) clean.conf: rm -rf *.h *~ .*.swp *.done diff --git a/make/defs-dev.mk b/make/defs-dev.mk index 34fa7947..73eaf698 100644 --- a/make/defs-dev.mk +++ b/make/defs-dev.mk @@ -23,6 +23,7 @@ IMAGEDIR ?= $(MODDIR)/../../images CTRLDIR ?= $(ENV_PREFIX)$(HOME)/bin$(FLAVOUR_PATH_SUFFIX) DAEMON_RUN_DIR ?= $(ENV_PREFIX)$(HOME) PROFILE_DIR ?= $(ENV_PREFIX)$(HOME)/.profile.d$(FLAVOUR_PATH_SUFFIX) +INSTALL_CRONTABDIR ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)cron.d PIDDIR ?= $(VAR_PREFIX)$(FLAVOUR_PATH_PREFIX)run DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT) WORKING_DIR ?= $(ENV_PREFIX)$(HOME) @@ -162,6 +163,12 @@ LOGROTMODE ?= $(CFGMODE) LOGROTDIROWNER ?= $(CFGDIROWNER) LOGROTDIRGROUP ?= $(CFGDIRGROUP) LOGROTDIRMODE ?= $(CFGDIRMODE) +CRONTABOWNER ?= $(CFGOWNER) +CRONTABGROUP ?= $(CFGGROUP) +CRONTABMODE ?= 664 +CRONTABDIROWNER ?= $(CFGDIROWNER) +CRONTABDIRGROUP ?= $(CFGDIROWNER) +CRONTABDIRMODE ?= $(CFGDIRMODE) # -- options diff --git a/make/defs-dist.mk b/make/defs-dist.mk index 591eb906..5f1f4c92 100644 --- a/make/defs-dist.mk +++ b/make/defs-dist.mk @@ -23,6 +23,7 @@ IMAGEDIR ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/images CTRLDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)init.d DAEMON_RUN_DIR ?= $(VAR_PREFIX)/corefiles PROFILE_DIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)profile.d +INSTALL_CRONTABDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)cron.d PIDDIR ?= $(VAR_PREFIX)/run DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT) WORKING_DIR ?= $(VAR_PREFIX)/coredumps @@ -163,6 +164,12 @@ LOGROTMODE ?= $(CFGMODE) LOGROTDIROWNER ?= $(CFGDIROWNER) LOGROTDIRGROUP ?= $(CFGDIROWNER) LOGROTDIRMODE ?= $(CFGDIRMODE) +CRONTABOWNER ?= $(CFGOWNER) +CRONTABGROUP ?= $(CFGGROUP) +CRONTABMODE ?= 664 +CRONTABDIROWNER ?= $(CFGDIROWNER) +CRONTABDIRGROUP ?= $(CFGDIROWNER) +CRONTABDIRMODE ?= $(CFGDIRMODE) # -- options diff --git a/make/defs.mk b/make/defs.mk index 28d74cb3..74818170 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -394,6 +394,13 @@ INSTALL_LOGROTDIR = $(LOGROT_DIR) INSTALLED_LOGROT = $(addprefix $(INSTALL_LOGROTDIR)/,$(LOGROT)) endif +# -- CRONTAB +ifneq ($(TARGET),mingw) +CRONTAB += $(wildcard *.crontab) +BUILD_CRONTABDIR = $(TOPDIR)/cron.d +INSTALLED_CRONTAB = $(addprefix $(INSTALL_CRONTABDIR)/,$(CRONTAB)) +endif + # == ifeq ($(DEVELOPMENT),true) diff --git a/make/rules.mk b/make/rules.mk index 9fa51c5a..c84b8757 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -282,7 +282,7 @@ check_not_empty_$(1): endef INSTALLATION_FILE_TYPES = LIB PI HDR EXE SCRIPT INIT DOC PROFILE MAKE CFG \ - SYSCFG IMG LOG JAVA LD_CONF CGI LOGROT + SYSCFG IMG LOG JAVA LD_CONF CGI LOGROT CRONTAB #$(foreach attr,OWNER GROUP MODE,$(foreach type, $(INSTALLATION_FILE_TYPES),\ # $(eval $(call std_install_rules,$(type)$(attr)))))