www/rss Makefile

[Yavor Doganov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   08/01/27 11:14:47

Modified files:
        rss            : Makefile 

Log message:
        (gnunews.en): Depend on whatsnew.include instead of whatsnew.html.
        (../server/whatsnew.include): Renamed from whatsnew.html.  Use
        $(addfile) as first command in the recipe.  Strip useles declarations;
        the target is going to be included via SSI directive in a static
        whatsnew.html.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/rss/Makefile?cvsroot=www&r1=1.55&r2=1.56

Patches:
Index: Makefile
===================================================================
RCS file: /web/www/www/rss/Makefile,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- Makefile    24 Jan 2008 09:11:49 -0000      1.55
+++ Makefile    27 Jan 2008 11:14:18 -0000      1.56
@@ -31,7 +31,7 @@
 # Do the main GNU stuff.
 gnunews: gnunews.en gnunews.i18n
 
-gnunews.en: ../server ../server/whatsnew.html ../gnusflashes.include 
whatsnew.rss 
+gnunews.en: ../server ../server/whatsnew.include ../gnusflashes.include 
whatsnew.rss 
 
 # Translations of news items.
 # Add your translation here if you want it to be automatically built
@@ -78,10 +78,15 @@
        cvs $(CVSOPTS) ci -m "automatic update of the whatsnew RSS" $@
 
 # This is the target that sends the email to the translators list
-../server/whatsnew.html: ../server/whatsnew.txt
+../server/whatsnew.include: ../server/whatsnew.txt
+       $(addfile)
        head $< | mail -s "GNU news update" address@hidden
        gawk -f ../server/news-to-xml.awk $< | xsltproc ../server/whatsnew.xslt 
- > $@
-       cvs $(CVSOPTS) ci -m "automatic update of the whatsnew.html" $@
+# Delete declarations that are necessary for successful xsltproc
+# operation, but make whatsnew.html invalid when the target is
+# include'd in it.
+       sed --in-place "/<?xml\|<\!DOCTYPE/D" $@
+       cvs $(CVSOPTS) ci -m "automatic update of the whatsnew.include" $@
 
 ../gnusflashes.include: ../server/whatsnew.txt
        gawk -f ../server/news-to-xml.awk $< | xsltproc ../gnusflashes.xslt - > 
$@
@@ -102,6 +107,7 @@
 
 ../server/whatsnew.%.html: ../server/whatsnew.%.txt 
        $(addfile)
+# FIXME: Perhaps should be modified to generate whatsnew.%.include as well.
        ENCODING=utf-8 gawk -f ../server/news-to-xml.awk $< | xsltproc 
../server/whatsnew.$*.xslt - > $@
        cvs $(CVSOPTS) ci -m "automatic update whatsnew.html" $@