* The footer of home.xml is now generated from xhtml-content.xsl

* We are almost ready for the no-frame version.

diff --git a/helm/mowgli/home/html/Makefile b/helm/mowgli/home/html/Makefile
index f5e95f08c9817883dd8c1703a5f4dcbbbf1fef19..378b60e9b332f0822ca814345b3cb657c6fadab4 100644 (file)
--- a/helm/mowgli/home/html/Makefile
+++ b/helm/mowgli/home/html/Makefile
@@ -1,4 +1,8 @@
+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
 
@@ -9,7 +13,11 @@ XSLROOT = ../xsl
 
 RMDOCTYPE = "s/<\\!DOCTYPE[^>]*>//"
 
-XHTMLCONTENT = $(XSLROOT)/xhtml-content.xsl
+ifeq ($(FRAMES),yes)
+       XHTMLCONTENT = $(XSLROOT)/xhtml-content.xsl
+else
+       XHTMLCONTENT = $(XSLROOT)/xhtml-content-no-frames.xsl
+endif
 
 PEOPLE = \
        people/aei/kelley.html \
@@ -134,10 +142,18 @@ home.html: $(XMLROOT)/home.xml \
            $(XHTMLCONTENT)
        $(XSLTP) -o latest-news.xml $(XSLROOT)/latest-news.xsl $(XMLROOT)/news.xml
        $(XSLTP) --param today `date +%Y%m%d` -o approaching-deadlines.xml $(XSLROOT)/approaching-deadlines.xsl $(XMLROOT)/other-events.xml
-       $(XSLTP) --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) $(XMLROOT)/home.xml
+       $(XSLTP) --param make_header "false()" --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) $(XMLROOT)/home.xml
 
+ifeq ($(FRAMES),yes)
 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'" -o $@ $(XHTMLCONTENT) $(XMLROOT)/home.xml
+endif
 
 members/ml-help-example.txt: $(TEMPLATESROOT)/ml-help-example.txt
        cp $< $@
@@ -270,7 +286,7 @@ install: $(DOCUMENTS)
        cp ../htaccess $(DESTDIR)/html/members/.htaccess
        mkdir -p $(DESTDIR)/html/members/contract
        cp ../misc/contract/*.* $(DESTDIR)/html/members/contract
-       sed s/menu\\.html/html\\/menu\\.html/ <index.html | sed s/home\\.html/html\\/home\\.html/ >$(DESTDIR)/index.html
+       if [ -f dot_dot_index.html ] ; then cp dot_dot_index.html $(DESTDIR)/index.html ; else sed s/menu\\.html/html\\/menu\\.html/ <index.html | sed s/home\\.html/html\\/home\\.html/ >$(DESTDIR)/index.html ; fi
 
 uninstall:
        rm -rf $(DESTDIR)/*