Modified Files:

[helm.git] / helm / mowgli / home / html / Makefile

diff --git a/helm/mowgli/home/html/Makefile b/helm/mowgli/home/html/Makefile
index 8a2193638045caaf833799069859d53fbe389545..ddd9a4019b4e6f85ade18c26cb889e6dc9583d21 100644 (file)
--- a/helm/mowgli/home/html/Makefile
+++ b/helm/mowgli/home/html/Makefile
@@ -1,14 +1,11 @@
+# Note: "make FRAMES=x" works too
 FRAMES = yes
 #FRAMES = no
 
-#DESTDIR = /projects/mowgli/public_html/frames
-#DESTDIR = /projects/mowgli/public_html/no_frames
 DESTDIR = /projects/mowgli/public_html
 #DESTDIR = /tmp/mowgli
 
-#HTMLDESTDIRSUFFIX = html_frames
-#HTMLDESTDIRSUFFIX = html_no_frames
-HTMLDESTDIRSUFFIX = html
+HTMLDESTDIRSUFFIX = html_$(FRAMES)_frames
 
 HTMLDESTDIR = $(DESTDIR)/$(HTMLDESTDIRSUFFIX)
 
@@ -61,6 +58,9 @@ DOCUMENTS = \
             project-management.html \
             project-objectives.html \
             project-summary.html \
+            contribution.html \
+            innovation.html \
+            EC-contribution.html \
             consortium.html \
             project.html \
            news.html \
@@ -122,6 +122,10 @@ DOCUMENTS = \
             publications/others/tcs2001_og.html \
             publications/others/tphols2000_gwz.html \
             publications/others/tphols2001_apss.html \
+            publications/others/w3c_bl98.html \
+            publications/others/cup_hp91.html \
+            publications/others/cup_hp93.html \
+            publications/others/cc.html \
             work-packages/index.html \
             work-packages/distribution.html \
             work-packages/information-dissemination-and-exploitation.html \
@@ -146,19 +150,11 @@ home.html: $(XMLROOT)/home.xml \
        $(XSLTP) --param today `date +%Y%m%d` -o approaching-deadlines.xml $(XSLROOT)/approaching-deadlines.xsl $(XMLROOT)/other-events.xml
        $(XSLTP) --param make_header "false()" --param path_to_top "'.'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) $(XMLROOT)/home.xml
 
-ifeq ($(FRAMES),yes)
 menu.html: $(XMLROOT)/menu.xml
        cp $< $@
 
 index.html: $(TEMPLATESROOT)/index.html
        cp $< $@
-else
-index.html: home.html
-       cp $< $@
-#Same stuff as for home.html... but with a different path_to_top
-dot_dot_index.html: home.html
-       $(XSLTP) --param make_header "false()" --param path_to_top "'html'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) $(XMLROOT)/home.xml
-endif
 
 members/ml-help-example.txt: $(TEMPLATESROOT)/ml-help-example.txt
        cp $< $@
@@ -183,6 +179,18 @@ project-objectives.html: $(XMLROOT)/project-objectives.xml \
                         $(XHTMLCONTENT)
        sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'.'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) -
 
+contribution.html: $(XMLROOT)/contribution.xml \
+                         $(XHTMLCONTENT)
+       sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'.'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) -
+
+innovation.html: $(XMLROOT)/innovation.xml \
+                         $(XHTMLCONTENT)
+       sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'.'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) -
+
+EC-contribution.html: $(XMLROOT)/EC-contribution.xml \
+                         $(XHTMLCONTENT)
+       sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'.'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) -
+
 mowgli-events/kick-off.html: $(XMLROOT)/mowgli-events/kick-off.xml \
                             $(XHTMLCONTENT)
        sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'..'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) -
@@ -289,7 +297,13 @@ install: $(DOCUMENTS)
        mkdir -p $(DESTDIR)/misc/contract
        cp ../htaccess $(DESTDIR)/misc/contract/.htaccess
        cp ../misc/contract/*.* $(DESTDIR)/misc/contract
-       if [ -f dot_dot_index.html ] ; then cp dot_dot_index.html $(DESTDIR)/index.html ; else sed s/menu\\.html/$(HTMLDESTDIRSUFFIX)\\/menu\\.html/ <index.html | sed s/home\\.html/$(HTMLDESTDIRSUFFIX)\\/home\\.html/ >$(DESTDIR)/index.html ; fi
+       if [ $(FRAMES) = yes ] ; \
+       then \
+        sed s/menu\\.html/$(HTMLDESTDIRSUFFIX)\\/menu\\.html/ <index.html | \
+         sed s/home\\.html/$(HTMLDESTDIRSUFFIX)\\/home\\.html/ >$(DESTDIR)/index.html ; \
+        else \
+         cp home.html $(HTMLDESTDIR)/index.html ; \
+       fi
 
 uninstall:
        rm -rf $(DESTDIR)/*