web/hosts/www Makefile.in,1.25,1.26

Update of /cvs/fresco/web/hosts/www
In directory purcel:/tmp/cvs-serv29392/hosts/www

Modified Files:
	Makefile.in 
Log Message:
integrate tutorial build

Index: Makefile.in
===================================================================
RCS file: /cvs/fresco/web/hosts/www/Makefile.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Makefile.in	22 Jan 2003 01:23:34 -0000	1.25
+++ Makefile.in	23 Jan 2003 08:13:24 -0000	1.26
@@ -1,15 +1,11 @@
 srcdir	:= @abs_srcdir@
 fresco_doc	:= @fresco_doc@
 
-ifdef $(fresco_doc)
-subdirs:= tutorial
-endif
-
 include ../../config.mk
 
 action	:= all
 
-.PHONY: all $(subdirs)
+.PHONY: all tutorial
 
 pages	:= index.html status.html screenshots.html \
          news.html newsarchive.html news1998.html news1999.html \
@@ -24,13 +20,12 @@
 
 vpath %.xml $(srcdir)
 
-all: $(pages) snapshots.html tutorial-header.html $(subdirs)
-
-$(subdirs):
-	@echo making $(action) in $@
-	$(MAKE) -C $@ $(action)
+all: $(pages) snapshots.html
+ifdef fresco_doc
+	$(MAKE) -C tutorial
+endif
 
-install: $(pages) snapshots.html tutorial-header.html
+install: $(pages) snapshots.html
 	mkdir -p $(sitedir)/root
 	cp $(pages) $(sitedir)/root
 	cp $(topdir)/xsl/default.css $(sitedir)/root
@@ -38,15 +33,14 @@
 	echo "</td></tr></table>" >> snapshots-header.html; \
 	mkdir -p $(sitedir)/root/snapshots
 	cp snapshots-header.html $(sitedir)/root/snapshots/header.html
-	mkdir -p $(sitedir)/root/tutorial
-	cp tutorial-header.html $(sitedir)/root/tutorial/header.html
-	cp $(topdir)/xsl/tutorial.css $(sitedir)/root/tutorial
 	mkdir -p $(sitedir)/root/irc-logs
 	cp $(topdir)/data/irc-logs/*.html $(sitedir)/root/irc-logs
 	if [ ! -e $(sitedir)/root/docs ] ; then \
 	  ln -s $(topdir)/data/docs $(sitedir)/root/docs ; \
 	fi
-	$(MAKE) action="install" sitedir=$(sitedir)
+ifdef fresco_doc
+	$(MAKE) -C tutorial install sitedir=$(sitedir)
+endif
 
 %.html:	%.xml $(data) menu.xml $(xsl)
 	@echo generating $@
@@ -54,3 +48,6 @@
 
 clean:
 	rm -f *.html
+ifdef fresco_doc
+	$(MAKE) -C tutorial clean
+endif