Final commit for frames/no-frames versions.

1) You can now compile (and install!) the two versions together
   typing make FRAMES=x" twice.
2) The default index.html is a patched copy of html_yes_frames/index.html
   when FRAMES=yes and is not there when FRAMES=no. [I don't know what
   to put there in this case! ;-(]

The only variable that must be set in the Makefile is the destination
directory.

Question: what should we do now? Keep only one of the two versions?
Keep both of them and add a first page in which the user can choose
the version he prefers? Put a link from one version to the other
and keep one as the default?

diff --git a/helm/mowgli/home/html/Makefile b/helm/mowgli/home/html/Makefile
index 8a2193638045caaf833799069859d53fbe389545..b281384a6721511de628775d65eb52c2d0e166e0 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)
 
@@ -146,19 +143,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 $< $@
@@ -289,7 +278,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)/*