[m-rev.] diff: fix web page HTML manual installation

[Fergus Henderson]

Branches: main
Estimated hours taken: 1.5

Fix a bug where the HTML version of the manuals was not being installed
on the web page.

w3/information/Makefile:
	When copying the HTML documentation, make sure that we copy the
	mercury_ref, mercury_user_guide, etc. subdirectories that are
	generated by "makeinfo --html".

	Also, use "&&" rather than ";" to ensure that failures are not
	silently ignored.

Workspace: /mnt/ceres/home/ceres/fjh/mercury
Index: w3/information/Makefile
===================================================================
RCS file: /home/mercury1/repository/w3/information/Makefile,v
retrieving revision 1.19
diff -u -d -r1.19 Makefile
--- w3/information/Makefile	19 Oct 2001 05:24:32 -0000	1.19
+++ w3/information/Makefile	21 Jan 2004 04:58:01 -0000
@@ -52,16 +52,27 @@
 	for branch in release latest; do \
 		info_dir=`pwd`; \
 		doc_dir=$$info_dir/doc-$$branch; \
-		cd mercury-$$branch/mercury; \
-		echo "LIBRARY_DIR=`pwd`/library"  > Mmake.common; \
-		echo "PERL=perl"  >> Mmake.common; \
-		echo "INFO=info"  >> Mmake.common; \
-		echo "DVIPS=dvips"  >> Mmake.common; \
-		echo 'include $$(MERCURY_DIR)/VERSION'  >> Mmake.common; \
-		(cd doc; mmake split_html ps); \
-		$(CP) doc/*.html doc/*.ps $$doc_dir; \
-		(cd $$doc_dir; gzip -f -9 *.ps); \
-		cd $$info_dir; \
+		cd mercury-$$branch/mercury && \
+		echo "LIBRARY_DIR=`pwd`/library"  > Mmake.common && \
+		echo "PERL=perl"  >> Mmake.common && \
+		echo "INFO=info"  >> Mmake.common && \
+		echo "DVIPS=dvips"  >> Mmake.common && \
+		echo 'include $$(MERCURY_DIR)/VERSION'  >> Mmake.common && \
+		(cd doc && mmake split_html ps) && \
+		$(CP) doc/*.html doc/*.ps $$doc_dir && \
+		if [ -d doc/mercury_ref ]; then \
+		    	$(CP) doc/mercury_ref doc/mercury_user_guide \
+				doc/mercury_library doc/mercury_faq \
+				doc/mercury_trans_guide \
+				$$doc_dir; \
+		else \
+			true; \
+		fi && \
+		(cd $$doc_dir && gzip -f -9 *.ps) && \
+		cd $$info_dir || { \
+			echo "*** copying documentation failed" 1>&2; \
+			exit 1; \
+		} \
 	done
 	# It's not worth installing the release branch versions of
 	# these files. Developers should normally be working with

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------