[m-rev.] [diff] Update website for configuration on champagne (new server)

[Paul Bone]

Makefile.common:
include/globals.inc.in:
Makefile:
    As above.
---
 Makefile               | 12 +++++++-----
 Makefile.common        |  2 +-
 include/globals.inc.in |  4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index fc165dc..2d8d6a1 100644
--- a/Makefile
+++ b/Makefile
@@ -41,11 +41,13 @@ mcorba.html: mcorba_newsdb.inc
 
 install: local_install
 
-local_install:
-	/bin/rm -rf "$(INSTALL_WEBDIR)/images"
-	$(CP) images $(INSTALL_WEBDIR)
-	chgrp -R mercury $(INSTALL_WEBDIR)/images
-	chmod -R g+w,a+rx $(INSTALL_WEBDIR)/images
+# What is this in aid of? It doesn't make sense on the champagne server (at
+# the moment).  So I commented it out.
+# local_install:
+# 	/bin/rm -rf "$(INSTALL_WEBDIR)/images"
+# 	$(CP) images $(INSTALL_WEBDIR)
+# 	chgrp -R mercury $(INSTALL_WEBDIR)/images
+# 	chmod -R g+w,a+rx $(INSTALL_WEBDIR)/images
 
 clean: local_clean
 
diff --git a/Makefile.common b/Makefile.common
index a0ab817..982c28f 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -12,7 +12,7 @@ ifndef PHP3
 	PHP3=/usr/bin/php -q
 endif
 ifndef WWW_DOMAIN
-	WWW_DOMAIN="www.mercury.csse.unimelb.edu.au"
+	WWW_DOMAIN="www.mercurylang.org"
 endif
 BETA_WEBDIR="$(INSTALL_WEBDIR)/download/files/beta-releases/rotd"
 ifndef BETA_FTPDIR
diff --git a/include/globals.inc.in b/include/globals.inc.in
index 0c58d9f..42050c1 100644
--- a/include/globals.inc.in
+++ b/include/globals.inc.in
@@ -1,5 +1,5 @@
 <?php
-	$installed_path="/home/mercury/mercury5/installed_w3";
+	$installed_path="/srv/www/mercurylang";
 
 	$current_release="<RELEASE_VERSION>";
 	$next_beta_version="<NEXT_BETA_VERSION>";
@@ -22,6 +22,6 @@
 	exec("cat $rotd_files_path/latest-unstable-version", $exec_output);
 	$rotd_version=$exec_output[0];
 	
- 	$ftp_domain="ftp.mercury.csse.unimelb.edu.au";
+ 	$ftp_domain="ftp.mercurylang.org";
  	$www_domain="<WWW_DOMAIN>";
 ?>
-- 
1.8.1.3