for review: More WWW changes

[Peter David ROSS]

Hi,

Tyson can you have a look at these changes.

Pete.

===================================================================


Estimated hours taken: 5

Changes to the Mercury website so as to allow it to be installed every
day automatically.

Makefile:
    Install the images directory.

include/template.inc:
    Refer to the correct logo.

information/Makefile:
    Automatically build the documentation.

mailing-lists/mercury-developers/Makefile:
    Don't copy the include directory.


Index: Makefile
===================================================================
RCS file: /home/mercury1/repository/w3/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile	1998/09/01 02:41:01	1.1.1.1
+++ Makefile	1998/09/01 04:53:28
@@ -19,6 +19,12 @@
 index.html: latest_news.inc
 news.html: latest_news.inc old_news.inc
 
+install: local_install
+
+local_install:
+	cp -a images $(INSTALL_WEBDIR)
+
+
 #-----------------------------------------------------------------------------#
 
 include Makefile.common
Index: include/template.inc
===================================================================
RCS file: /home/mercury1/repository/w3/include/template.inc,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 template.inc
--- template.inc	1998/09/01 02:41:04	1.1.1.1
+++ template.inc	1998/09/01 05:21:52
@@ -7,7 +7,7 @@
     </TD>
 
     <TD width="10%">
-    <IMG SRC="/mercury/images/merclogo_small.jpg" border="2"
+    <IMG SRC="<?echo $root?>/images/merclogo_small.jpg" border="2"
         hspace="10">
     </TD>
 </TABLE>
Index: information/Makefile
===================================================================
RCS file: /home/mercury1/repository/w3/information/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile	1998/09/01 02:41:07	1.1.1.1
+++ Makefile	1998/09/01 04:58:38
@@ -1,4 +1,4 @@
-target: all
+target: all local
 
 ROOT=..
 HTML= 	benchmarks.html 	\
@@ -10,11 +10,30 @@
 	related.html
 
 install: local_install
+clean:   local_clean
 
-local_install:
-	for dir in bench papers;		\
+local:
+	[ -d doc ] || mkdir doc
+	[ ! -d mercury ] || (cvs update mercury/doc;	\
+		cvs update mercury/library;		\
+		cvs update mercury/compiler/notes)
+	[ -d mercury ] || (cvs checkout mercury/doc;	\
+		cvs checkout mercury/library;		\
+		cvs checkout mercury/compiler/notes)
+	echo "LIBRARY_DIR=`pwd`/mercury/library"  > mercury/Mmake.common
+	(cd mercury/doc; mmake html ps)
+	cp -a mercury/doc/*.html mercury/compiler/notes/*.html doc
+	cp -a mercury/doc/*.ps doc
+	(cd doc; gzip -f -9 *.ps)
+
+local_install: target
+	for dir in bench doc papers;		\
 	do					\
 		cp -a $$dir $(INSTALL_WEBDIR);	\
 	done
+
+local_clean:
+	-rm -rf doc
+	-rm -rf mercury
 
 include ../Makefile.common
Index: mailing-lists/mercury-developers/Makefile
===================================================================
RCS file: /home/mercury1/repository/w3/mailing-lists/mercury-developers/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile	1998/09/01 02:41:03	1.1.1.1
+++ Makefile	1998/09/01 05:32:44
@@ -11,7 +11,7 @@
 local_install:
 	for dir in `ls`;					\
 	do							\
-		if [ -d $$dir ];				\
+		if [ -d $$dir -a $$dir != "include" ];		\
 		then						\
 			cp -a $$dir $(INSTALL_WEBDIR);		\
 		fi						\

----
 +----------------------------------------------------------------------+
 | Peter Ross      M Sci/Eng Melbourne Uni                              |
 | petdr at cs.mu.oz.au  WWW: www.cs.mu.oz.au/~petdr/ ph: +61 3 9344 9158  |
 +----------------------------------------------------------------------+