[m-dev.] diff: some makefile fixes for the web site.

[Peter Ross]

Hi,


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


Estimated hours taken: 0.5

Some makefile fixes for the WWW pages.

Makefile.common:
    Make sure that we don't go into an infinite loop if a directory
    doesn't exist (e.g. tutorial).

tutorial/Makefile:
    Make sure that the files gets installed writable by group mercury.

Index: Makefile.common
===================================================================
RCS file: /home/staff/zs/imp/w3/Makefile.common,v
retrieving revision 1.8
diff -u -b -r1.8 Makefile.common
--- Makefile.common	1998/11/19 06:02:33	1.8
+++ Makefile.common	1999/06/17 08:38:45
@@ -24,7 +24,7 @@
 ifdef DIRS
 	for dir in $(DIRS); 				\
 	do 						\
-		(cd $$dir; $(MAKE) html); 		\
+		(cd $$dir && $(MAKE) html); 		\
 	done
 endif
 
@@ -33,7 +33,7 @@
 ifdef DIRS
 	for dir in $(DIRS); 				\
 	do 						\
-		(cd $$dir; $(MAKE) all); 		\
+		(cd $$dir && $(MAKE) all); 		\
 	done
 endif
 
@@ -45,8 +45,8 @@
 ifdef DIRS
 	for dir in $(DIRS);					\
 	do				        		\
-		(export INSTALL_WEBDIR=$(INSTALL_WEBDIR)/$$dir;	\
-		cd $$dir; $(MAKE) install);			\
+		(export INSTALL_WEBDIR=$(INSTALL_WEBDIR)/$$dir &&	\
+		cd $$dir && $(MAKE) install);				\
 	done
 endif
 	chmod a+r,g+w $(INSTALL_WEBDIR)/*
@@ -58,7 +58,7 @@
 ifdef DIRS
 	for dir in $(DIRS);			\
 	do				        \
-		(cd $$dir; $(MAKE) clean);	\
+		(cd $$dir && $(MAKE) clean);	\
 	done
 endif
 
Index: tutorial/Makefile
===================================================================
RCS file: /home/staff/zs/imp/tutorial/Makefile,v
retrieving revision 1.4
diff -u -b -r1.4 Makefile
--- Makefile	1999/03/26 11:33:17	1.4
+++ Makefile	1999/06/17 08:41:08
@@ -21,6 +21,8 @@
 	[ -d "$(INSTALL_WEBDIR)" ] || \
 		mkdir -p "$(INSTALL_WEBDIR)"
 	cp -af $(HTML) $(INSTALL_WEBDIR)
+	chmod a+r,g+w $(INSTALL_WEBDIR)/*
+	chgrp mercury $(INSTALL_WEBDIR)/*
 
 clean:
 	rm -f $(HTML)

----
 +----------------------------------------------------------------------+
 | 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  |
 +----------------------------------------------------------------------+
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------