janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-20 05:37:38 +01:00
Code Activity

defs.mk, rules.mk: Fix install_RSYSLOG target

Browse source
This commit is contained in:
Jan Lindemann 2010-08-29 09:23:44 +00:00 • committed by Jan Lindemann
commit b6a28cdde1
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/defs.mk
View file

@ -397,10 +397,10 @@ endif
# -- RSYSLOG # -- RSYSLOG
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
RSYSLOG += $(basename $(wildcard *.rsyslog)) RSYSLOG += $(wildcard *.rsyslog)
BUILD_RSYSLOGDIR = $(TOPDIR)/bin/rsyslog.d BUILD_RSYSLOGDIR = $(TOPDIR)/bin/rsyslog.d
INSTALL_RSYSLOGDIR = $(RSYSLOG_DIR) INSTALL_RSYSLOGDIR = $(RSYSLOG_DIR)
INSTALLED_RSYSLOG = $(addprefix $(INSTALL_RSYSLOGDIR)/,$(RSYSLOG)) INSTALLED_RSYSLOG = $(addprefix $(INSTALL_RSYSLOGDIR)/,$(patsubst %.rsyslog,%.conf,$(RSYSLOG)))
endif endif
# -- CRONTAB # -- CRONTAB

4
make/rules.mk
View file

@ -282,7 +282,7 @@ check_not_empty_$(1):
endef endef
INSTALLATION_FILE_TYPES = LIB PI HDR EXE SCRIPT INIT DOC PROFILE MAKE CFG \ INSTALLATION_FILE_TYPES = LIB PI HDR EXE SCRIPT INIT DOC PROFILE MAKE CFG \
SYSCFG IMG LOG JAVA LD_CONF CGI LOGROT CRONTAB SYSCFG IMG LOG JAVA LD_CONF CGI LOGROT RSYSLOG CRONTAB
#$(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)))))
@ -331,7 +331,7 @@ $(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_RSYSLOGDIR)/%.conf: %.rsyslog
$(INSTALL) -o $(RSYSLOGOWNER) -g $(RSYSLOGGROUP) -m $(RSYSLOGMODE) $< $@ $(INSTALL) -o $(RSYSLOGOWNER) -g $(RSYSLOGGROUP) -m $(RSYSLOGMODE) $< $@
%: %.sysconf %: %.sysconf