[m-rev.] for review: fix web site install

[Ian MacLarty]

For review by anyone.

Estimated hours taken: 0.5
Branches: main

Fix Mercury web site install problem.  The problem seems to be that
the cp option "--preserve=modes" (implied by -a) is not supported.  The fix
here is to just remove this option.

Makefile.common:
tutorial/Makefile:
tutorial/tutorial/Makefile:
    Change cp command options.

Index: Makefile.common
===================================================================
RCS file: /home/mercury1/repository/w3/Makefile.common,v
retrieving revision 1.16
diff -u -d -r1.16 Makefile.common
--- Makefile.common	3 Jul 2007 07:39:26 -0000	1.16
+++ Makefile.common	9 Apr 2008 02:38:25 -0000
@@ -14,7 +14,7 @@
 ifndef BETA_FTPDIR
 	BETA_FTPDIR="/home/earth/ftp/pub/mercury/beta-releases/rotd"
 endif
-CP=cp -af
+CP=cp -fdR --preserve=ownership,timestamps
 
 #-----------------------------------------------------------------------------#
 
Index: tutorial/Makefile
===================================================================
RCS file: /home/mercury1/repository/tutorial/Makefile,v
retrieving revision 1.5
diff -u -d -r1.5 Makefile
--- tutorial/Makefile	17 Jun 1999 08:48:14 -0000	1.5
+++ tutorial/Makefile	9 Apr 2008 03:05:08 -0000
@@ -6,6 +6,8 @@
 
 SRC = src/*.m
 
+CP=cp -fdR --preserve=ownership,timestamps
+
 #-----------------------------------------------------------------------------#
 
 all: $(HTML)
@@ -20,7 +22,7 @@
 	}
 	[ -d "$(INSTALL_WEBDIR)" ] || \
 		mkdir -p "$(INSTALL_WEBDIR)"
-	cp -af $(HTML) $(INSTALL_WEBDIR)
+	$(CP) $(HTML) $(INSTALL_WEBDIR)
 	chmod a+r,g+w $(INSTALL_WEBDIR)/*
 	chgrp mercury $(INSTALL_WEBDIR)/*
 
Index: tutorial/tutorial/Makefile
===================================================================
RCS file: /home/mercury1/repository/tutorial/Makefile,v
retrieving revision 1.5
diff -u -d -r1.5 Makefile
--- tutorial/tutorial/Makefile	17 Jun 1999 08:48:14 -0000	1.5
+++ tutorial/tutorial/Makefile	9 Apr 2008 03:05:21 -0000
@@ -6,6 +6,8 @@
 
 SRC = src/*.m
 
+CP=cp -fdR --preserve=ownership,timestamps
+
 #-----------------------------------------------------------------------------#
 
 all: $(HTML)
@@ -20,7 +22,7 @@
 	}
 	[ -d "$(INSTALL_WEBDIR)" ] || \
 		mkdir -p "$(INSTALL_WEBDIR)"
-	cp -af $(HTML) $(INSTALL_WEBDIR)
+	$(CP) $(HTML) $(INSTALL_WEBDIR)
 	chmod a+r,g+w $(INSTALL_WEBDIR)/*
 	chgrp mercury $(INSTALL_WEBDIR)/*
 
--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------