X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=GNUmakefile.in;h=64d51748ccc2c3d4272ee05ea1624935dda665d5;hb=52cf256c05896e5e82b9cac9afbaee41c9c597ab;hp=8219cf363146dc35a160dacba5b423b9998c0084;hpb=f2890c96a0aca3c54d5bb9a60491a6e126724764;p=privoxy.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 8219cf36..64d51748 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,8 +1,8 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.184 2009/09/26 17:21:01 fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.193 2010/11/14 14:59:33 fabiankeil Exp $
 #
-# Written by and Copyright (C) 2001-2009 members of the
+# Written by and Copyright (C) 2001-2010 members of the
 # Privoxy team. http://www.privoxy.org/
 #
 # Based on the Internet Junkbuster originally written
@@ -152,6 +152,9 @@ DOC_STATUS = @DOC_STATUS@
 DOSFILTER  = $(PERL) -p -e 's/\n/\r\n/'
 CVSROOT    = :pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa
 #TMPDIR     := $(shell mktemp -d /tmp/$(PROGRAM).XXXXXX)
+# If your SF user name differs from your local one,
+# change this to "ssh -l sf-username"
+SSH	= ssh
 
 #############################################################################
 # Setup for make distribution for now.
@@ -609,33 +612,37 @@ config-file-alt:
 webserver: tidy
 	@$(ECHO) -------------------------------------------------------
 	@$(ECHO) You will need to "create" a SF shell first:
-	@$(ECHO)    ssh -t USER,PROJECT@shell.sourceforge.net create
+	@$(ECHO)    ssh -t SF-USER-ID,ijbswa@shell.sourceforge.net create
 	@$(ECHO) Please make sure your documentation files are up to date.
-	@$(ECHO) Note that this command updates the home page and scps 
+	@$(ECHO) Note that this command updates the home page and copys 
 	@$(ECHO) all stuff to the webserver, it will not remove obsolete documents.
-	@$(ECHO) You will also need to change the user-manual symlink manually.
+	@$(ECHO) Note that a botched upload can result in the documentation
+	@$(ECHO) on the website becoming unreachable! Also the CSS files
+	@$(ECHO) currently seem to end up at the wrong place.
 	@$(ECHO) -------------------------------------------------------
 
+	@$(ECHO) Replacing the user-manual symlink
+	@$(SSH) shell.sourceforge.net "cd /home/groups/i/ij/ijbswa/htdocs && rm user-manual \
+	 && mkdir -p $(VERSION)/user-manual && ln -s $(VERSION)/user-manual user-manual"
+
 	@$(ECHO) Uploading html
 	@cd doc/webserver; \
           upload=`find . -type f -a -not \( -path "*/CVS*" -o -path "*/results*" \)`; \
-          $(TAR) c $$upload | ssh shell.sf.net 'cd /home/groups/i/ij/ijbswa/htdocs/; tar xvm 2>&1 | grep -v timestamp'
+          $(TAR) cf - $$upload | $(SSH) shell.sourceforge.net 'cd /home/groups/i/ij/ijbswa/htdocs/; tar xvm 2>&1 | grep -v timestamp'
 
 	@$(ECHO) Fixing permissions
-	@ssh shell.sf.net 'chmod -R 775 /home/groups/i/ij/ijbswa/htdocs 2>/dev/null; true'
-	@ssh shell.sf.net 'find /home/groups/i/ij/ijbswa/htdocs/ -type f | xargs chmod 664 2>/dev/null; true'
-	@ssh shell.sf.net 'chmod 666 /home/groups/i/ij/ijbswa/htdocs/actions/results/actions-feedback.txt 2>/dev/null; true'
-
+	@$(SSH) shell.sourceforge.net 'chmod -R 775 /home/groups/i/ij/ijbswa/htdocs 2>/dev/null; true'
+	@$(SSH) shell.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/ -type f | xargs chmod 664 2>/dev/null; true'
 
 web-actions: tidy
 	@$(ECHO) Uploading 
 	@cd doc/webserver/actions; \
           upload=`find . -type f -a -not \( -path "*/CVS*" -o -path "*/results*" \)`; \
-          $(TAR) c $$upload | ssh ijbswa.sourceforge.net 'cd /home/groups/i/ij/ijbswa/htdocs/actions; tar xvm'
+          $(TAR) cf - $$upload | $(SSH) ijbswa.sourceforge.net 'cd /home/groups/i/ij/ijbswa/htdocs/actions; tar xvm'
 
 	@$(ECHO) Fixing permissions
-	@ssh ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/actions/ -type f | xargs chmod 664 2>/dev/null'
-	@ssh ijbswa.sourceforge.net 'chmod 666 /home/groups/i/ij/ijbswa/htdocs/actions/results/actions-feedback.txt 2>/dev/null'
+	@$(SSH) ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/actions/ -type f | xargs chmod 664 2>/dev/null'
+	@$(SSH) ijbswa.sourceforge.net 'chmod 666 /home/groups/i/ij/ijbswa/htdocs/actions/results/actions-feedback.txt 2>/dev/null'
 
 ## 
 dok-put:
@@ -645,7 +652,7 @@ dok-put:
 		-czf $(DOC_FILE) ;\
 		$(ECHO) "Uploading doc package ..." ;\
 		scp $(DOC_FILE) ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/docs/
-		@ssh ijbswa.sourceforge.net 'chmod 775 /home/groups/i/ij/ijbswa/htdocs/docs/*gz 2>/dev/null; true'
+		@$(SSH) ijbswa.sourceforge.net 'chmod 775 /home/groups/i/ij/ijbswa/htdocs/docs/*gz 2>/dev/null; true'
 		$(RM) $(DOC_FILE)
 
 dok-get: