a more spohisticated symlink handling
authorhaftmann
Sun, 05 Jun 2005 14:33:02 +0200
changeset 16275 951803bff5b1
parent 16274 fb68cffed61f
child 16276 3a50bf1f04d0
a more spohisticated symlink handling
Admin/rsync-isabelle
Admin/website/build/main.mak
Admin/website/build/project.mak
--- a/Admin/rsync-isabelle	Sun Jun 05 14:33:02 2005 +0200
+++ b/Admin/rsync-isabelle	Sun Jun 05 14:33:02 2005 +0200
@@ -121,4 +121,4 @@
 
 ## main
 
-exec rsync -vaL $ARGS rsync://www4.in.tum.de/isabelle-dist/. "$DEST/."
+exec rsync -va $ARGS rsync://www4.in.tum.de/isabelle-dist/. "$DEST/."
--- a/Admin/website/build/main.mak	Sun Jun 05 14:33:02 2005 +0200
+++ b/Admin/website/build/main.mak	Sun Jun 05 14:33:02 2005 +0200
@@ -81,7 +81,7 @@
 	allstatic=''; \
 	for dir in $(STATICDIRS); \
 	do \
-		for file in `$(FIND) $$dir -type f -a ! -path "*/CVS/*"`; \
+		for file in `$(FIND) -L $$dir -type f -a ! -path "*/CVS/*"`; \
 		do \
 			outputfile=$(OUTPUTROOT)/$$file; \
 			outputdir=`dirname $$outputfile`; \
@@ -97,7 +97,7 @@
 	echo 'DEP_HTML=$$(DEP_ALLSTATIC) $$(DEP_SYMLINKS) include/documentationdist.include.html $(DEP_FILE) $(CONF)' >> $(DEP_FILE); \
 	echo >> $(DEP_FILE); \
 	allhtml=''; \
-	for html in `$(FIND) . -P -name "*.html" -a ! -name "*.include.html"`; \
+	for html in `$(FIND) -P . -name "*.html" -a ! -name "*.include.html"`; \
 	do \
 		outputfile=$(OUTPUTROOT)/$$html; \
 		outputdir=`dirname $$outputfile`; \
--- a/Admin/website/build/project.mak	Sun Jun 05 14:33:02 2005 +0200
+++ b/Admin/website/build/project.mak	Sun Jun 05 14:33:02 2005 +0200
@@ -1,9 +1,6 @@
 # isaweb makefile - project-specific dependencies
 # $Id$
 
-symlinks: $(DEP_SYMLINKS)
-.PHONY: symlinks
-
 #~ DEP_SYMLINKS=$(OUTPUTROOT)/dist/packages $(OUTPUTROOT)/library
 
 #~ $(OUTPUTROOT)/dist/packages: $(ISABELLE_DIST)
@@ -22,4 +19,7 @@
 	ln -s $< $@
 
 include/documentationdist.include.html: $(ISABELLE_DOC_CONTENT_FILE)
-	perl build/mkcontents.pl -p '//dist/packages/Isabelle/doc/' $< $@
\ No newline at end of file
+	perl build/mkcontents.pl -p '//dist/packages/Isabelle/doc/' $< $@
+
+symlinks: $(DEP_SYMLINKS)
+.PHONY: symlinks