# HG changeset patch
# User haftmann
# Date 1129881243 -7200
# Node ID 2146e292f62f419e1ca708119e2db46b632cf896
# Parent  f5ff234ce6b37edb2fbce37e2c52844903e12cff
towards an improved website/makedist integration

diff -r f5ff234ce6b3 -r 2146e292f62f Admin/website/build/localconf.at.template.mak
--- a/Admin/website/build/localconf.at.template.mak	Fri Oct 21 09:18:27 2005 +0200
+++ b/Admin/website/build/localconf.at.template.mak	Fri Oct 21 09:54:03 2005 +0200
@@ -9,7 +9,7 @@
 ISABELLE_DIST=$(DISTBASE)
 
 # location of doc content file
-ISABELLE_DOC_CONTENT_FILE=$(DISTBASE)/$(DISTIDENT)/doc/Contents
+ISABELLE_DOC_CONTENT_FILE=$(DISTBASE)/$(DISTNAME)/doc/Contents
 
 # dirs to copy to build target
 STATICDIRS=css img media misc
diff -r f5ff234ce6b3 -r 2146e292f62f Admin/website/build/localconf.sun.template.mak
--- a/Admin/website/build/localconf.sun.template.mak	Fri Oct 21 09:18:27 2005 +0200
+++ b/Admin/website/build/localconf.sun.template.mak	Fri Oct 21 09:54:03 2005 +0200
@@ -9,7 +9,7 @@
 ISABELLE_DIST=$(DISTBASE)
 
 # location of doc content file
-ISABELLE_DOC_CONTENT_FILE=$(DISTBASE)/$(DISTIDENT)/doc/Contents
+ISABELLE_DOC_CONTENT_FILE=$(DISTBASE)/$(DISTNAME)/doc/Contents
 
 # dirs to copy to build target
 STATICDIRS=css img media misc
diff -r f5ff234ce6b3 -r 2146e292f62f Admin/website/build/project.mak
--- a/Admin/website/build/project.mak	Fri Oct 21 09:18:27 2005 +0200
+++ b/Admin/website/build/project.mak	Fri Oct 21 09:54:03 2005 +0200
@@ -21,7 +21,9 @@
 	$(COPY) -vRud $</[^w]* $@
 	chgrp -R $(TARGET_GROUP) $@
 	chmod -R u-w,g-w,o-w $@
-	ln -s $(ISABELLE_DIST)/$(DISTIDENT) Isabelle
+	-[ ! -e Isabelle ] && ln -s $(ISABELLE_DIST)/$(DISTNAME) Isabelle
+	-chgrp -h $(TARGET_GROUP) Isabelle
+	-chmod -h u-w,g-w,o-w Isabelle
 
 else
 
@@ -30,7 +32,9 @@
 	$(RSYNC) -v --exclude='/website/' -a --delete --delete-after $</ $@
 	chgrp -R $(TARGET_GROUP) $@
 	chmod -R u-w,g-w,o-w $@
-	ln -s $(ISABELLE_DIST)/$(DISTIDENT) Isabelle
+	-[ ! -e Isabelle ] && ln -s $(ISABELLE_DIST)/$(DISTNAME) Isabelle
+	-chgrp -h $(TARGET_GROUP) Isabelle
+	-chmod -h u-w,g-w,o-w Isabelle
 
 SYNC_ALWAYS:
 
diff -r f5ff234ce6b3 -r 2146e292f62f Admin/website/conf/distinfo.mak
--- a/Admin/website/conf/distinfo.mak	Fri Oct 21 09:18:27 2005 +0200
+++ b/Admin/website/conf/distinfo.mak	Fri Oct 21 09:54:03 2005 +0200
@@ -1,4 +1,4 @@
-# this is a generated file - do not edit!
+# this is a default file
 
 DISTNAME=Isabelle2005
 DISTIDENT=Isabelle2005