From b6a28cdde1bc381e4ecadf10acc89e77c8d59541 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Sun, 29 Aug 2010 09:23:44 +0000
Subject: [PATCH] defs.mk, rules.mk: Fix install_RSYSLOG target

---
 make/defs.mk  | 4 ++--
 make/rules.mk | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/make/defs.mk b/make/defs.mk
index a89a48b7..6d38d50c 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -397,10 +397,10 @@ endif
 
 # -- RSYSLOG
 ifneq ($(TARGET),mingw)
-RSYSLOG           += $(basename $(wildcard *.rsyslog))
+RSYSLOG           += $(wildcard *.rsyslog)
 BUILD_RSYSLOGDIR   = $(TOPDIR)/bin/rsyslog.d
 INSTALL_RSYSLOGDIR = $(RSYSLOG_DIR)
-INSTALLED_RSYSLOG  = $(addprefix $(INSTALL_RSYSLOGDIR)/,$(RSYSLOG))
+INSTALLED_RSYSLOG  = $(addprefix $(INSTALL_RSYSLOGDIR)/,$(patsubst %.rsyslog,%.conf,$(RSYSLOG)))
 endif
 
 # -- CRONTAB
diff --git a/make/rules.mk b/make/rules.mk
index 886de3e6..ecaf32bb 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 CRONTAB
+	SYSCFG IMG LOG JAVA LD_CONF CGI LOGROT RSYSLOG CRONTAB
 
 #$(foreach attr,OWNER GROUP MODE,$(foreach type, $(INSTALLATION_FILE_TYPES),\
 #	$(eval $(call std_install_rules,$(type)$(attr)))))
@@ -331,7 +331,7 @@ $(INSTALL_INITDIR)/%: %.init
 $(INSTALL_LOGROTDIR)/%: %.logrotate
 	$(INSTALL) -o $(LOGROTOWNER) -g $(LOGROTGROUP) -m $(LOGROTMODE) $< $@
 
-$(INSTALL_RSYSLOGDIR)/%: %.logrotate
+$(INSTALL_RSYSLOGDIR)/%.conf: %.rsyslog
 	$(INSTALL) -o $(RSYSLOGOWNER) -g $(RSYSLOGGROUP) -m $(RSYSLOGMODE) $< $@
 
 %: %.sysconf