X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmowgli%2Fhome%2Fhtml%2FMakefile;h=ed182475076b8568a200db46bcc352299c020a09;hb=4622e9d4494da96394f1cdb40bb85b3e7938def3;hp=01d9d262dd07a7e8922b6776d66c815ea0b176db;hpb=e4290a68e5e2d91661b78eb8e33dbe668e054376;p=helm.git

diff --git a/helm/mowgli/home/html/Makefile b/helm/mowgli/home/html/Makefile
index 01d9d262d..ed1824750 100644
--- a/helm/mowgli/home/html/Makefile
+++ b/helm/mowgli/home/html/Makefile
@@ -126,13 +126,11 @@ home.html: $(TEMPLATESROOT)/home.html.top $(TEMPLATESROOT)/home.html.bot \
 	   $(XMLROOT)/other-events.xml \
 	   $(XMLROOT)/mowgli-events.xml \
 	   $(XSLROOT)/latest-news.xsl \
-	   $(XSLROOT)/sort-events-by-beginning.xsl \
 	   $(XSLROOT)/approaching-deadlines.xsl
 	cat $(TEMPLATESROOT)/home.html.top >$@
 	$(XSLTP) $(XSLROOT)/latest-news.xsl $(XMLROOT)/news.xml >>$@
-#	cat $(TEMPLATESROOT)/home.html.mid >>$@
-#	$(XSLTP) $(XSLROOT)/sort-events-by-beginning.xsl $(XMLROOT)/other-events.xml | $(XSLTP) $(XSLROOT)/approaching-deadlines.xsl - >>$@
-#	cat $(TEMPLATESROOT)/home.html.bot >>$@
+	echo "</dl>" >> $@
+	$(XSLTP) --param today `date +%Y%m%d` $(XSLROOT)/approaching-deadlines.xsl $(XMLROOT)/other-events.xml >>$@
 	sed s/\@DATE\@/"`date`"/ $(TEMPLATESROOT)/home.html.bot >>$@
 
 index.html: $(TEMPLATESROOT)/index.html
@@ -185,18 +183,16 @@ news.html: $(XMLROOT)/news.xml \
 	$(XSLTP) -o $@ $(XSLROOT)/news.xsl $<
 
 other-events.html: $(XMLROOT)/other-events.xml \
-	   $(XSLROOT)/sort-events-by-beginning.xsl \
 	   $(XSLROOT)/events.xsl
-	$(XSLTP) $(XSLROOT)/sort-events-by-beginning.xsl $< | $(XSLTP) --param events-class "'Other'" -o $@ $(XSLROOT)/events.xsl -
+	$(XSLTP) --param today `date +%Y%m%d` --param events-class "'Other'" -o $@ $(XSLROOT)/events.xsl $<
 
 mowgli-events.html: $(XMLROOT)/mowgli-events.xml \
-	   $(XSLROOT)/sort-events-by-beginning.xsl \
 	   $(XSLROOT)/events.xsl
-	$(XSLTP) $(XSLROOT)/sort-events-by-beginning.xsl $< | $(XSLTP) --param events-class "'MOWGLI'" -o $@ $(XSLROOT)/events.xsl -
+	$(XSLTP) --param today `date +%Y%m%d` --param events-class "'MOWGLI'" -o $@ $(XSLROOT)/events.xsl $<
 
 deadlines.html: $(XMLROOT)/other-events.xml \
 	   $(XSLROOT)/deadlines.xsl
-	$(XSLTP) --param events-class "'Other'" -o $@ $(XSLROOT)/deadlines.xsl $<
+	$(XSLTP) --param today `date +%Y%m%d` --param events-class "'Other'" -o $@ $(XSLROOT)/deadlines.xsl $<
 
 deliverables/%.html: $(XMLROOT)/deliverables/%.xml \
               $(XSLROOT)/deliverable.xsl