From 6c59a952ae1788e062a17345ff29803de10cf218 Mon Sep 17 00:00:00 2001
From: astro <astro@31f61c52-7bfb-0310-b897-fc00f8a278f0>
Date: Tue, 4 Apr 2006 21:31:20 +0000
Subject: [PATCH] chaosupdates.rdf generalisiert und in make clean einbezogen

git-svn-id: svn://svn.c3d2.de/c3d2-web/trunk@160 31f61c52-7bfb-0310-b897-fc00f8a278f0
---
 Makefile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 109cb75da..80d7a9b53 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,8 @@ SKEL=empty
 SKELFILE=content/skel-$(SKEL).xml
 # Dateinamen der Inhalte:
 CONTENT=$(PAGES) $(DS_PAGES) $(NEWSFILES)
+# Chaosupdates
+WWW_CCC_DE_UPDATES=chaosupdates.rdf
 
 PAGES:=$(patsubst content/%.xml, www/%.html, $(filter-out $(NAVIGATION) $(SKELETONS), $(wildcard content/*.xml)))
 DS_PAGES:=$(patsubst content/datenspuren/%.xml, www/datenspuren/%.html, $(wildcard content/datenspuren/*.xml))
@@ -40,7 +42,7 @@ NEWSINDEX:=content/news.xml
 NEWSITEMS:=$(filter-out $(NEWSINDEX), $(wildcard content/news/*.xml))
 NEWSFILES:=www/news.html www/news-rss.xml www/news-atom.xml
 DTD:=dtd/c3d2web.dtd
-CLEAN=$(CONTENT) $(NEWSFILES)
+CLEAN=$(CONTENT) $(NEWSFILES) $(WWW_CCC_DE_UPDATES)
 
 ### Defaults ###
 .PHONY: export contents clean mrproper all install check mirrorcontent
@@ -54,7 +56,7 @@ install: export
 contents: $(CONTENT) $(DTD)
 
 export: contents
-	$(RSYNC) $(RSYNC_FLAGS) --exclude=".svn/" www/ chaosupdates.rdf content dtd xsl  $(DESTDIR)/
+	$(RSYNC) $(RSYNC_FLAGS) --exclude=".svn/" www/ $(WWW_CCC_DE_UPDATES) content dtd xsl  $(DESTDIR)/
 
 
 check: $(PAGES)
@@ -94,7 +96,7 @@ www/datenspuren/%.html: content/datenspuren/%.xml $(DS_STYLE)
 	$(VALIDATOR) $(VFLAGS) $<
 	$(PROCESSOR) $(PFLAGS) -o $@ $(DS_STYLE) $<
 
-www/%.html: content/%.xml $(STYLE) $(NAVIGATION) chaosupdates.rdf
+www/%.html: content/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES)
 	$(VALIDATOR) $(VFLAGS) $<
 	$(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) $<
 
@@ -118,8 +120,8 @@ content/%.xml:
 	$(MAKE) edit/$(patsubst content/%.xml,%,$@)
 
 ### Die neuesten Chaosupdates holen ###
-chaosupdates.rdf:
-	$(WGET) http://www.ccc.de/updates/chaosupdates.rdf || \
+$(WWW_CCC_DE_UPDATES):
+	$(WGET) http://www.ccc.de/updates/$(WWW_CCC_DE_UPDATES) || \
 	cp chaosupdates-2006-01-02.rdf $@
 
 ### Mr. Propper ###
@@ -127,6 +129,6 @@ clean:
 	rm -f $(CLEAN)
 
 mrproper: clean
-	rm -f chaosupdates.rdf
+	rm -f $(WWW_CCC_DE_UPDATES)
 	rm -f $(XHTML_DTD_FILES)
 	rm -rf www-export