X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=GNUmakefile.in;h=3ac4174283834e1c74697fef9bb31813e7bb7e53;hb=a24d0902e151f305abb90bd72cb230a39c76bb8e;hp=bb3ea21ad37d48828a8abc5dc5d90f62386a36f9;hpb=f67b3326138f428863c21c7738e0c8db87fa6f5c;p=privoxy.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index bb3ea21a..3ac41742 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,8 +1,8 @@
 # Note:  GNUmakefile is built automatically from GNUmakefile.in
 #
-# $Id: GNUmakefile.in,v 1.252 2016/07/28 08:16:04 fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.257 2017/02/20 17:28:52 fabiankeil Exp $
 #
-# Written by and Copyright (C) 2001-2016 members of the
+# Written by and Copyright (C) 2001-2017 members of the
 # Privoxy team. https://www.privoxy.org/
 #
 # Based on the Internet Junkbuster originally written
@@ -144,7 +144,7 @@ DOC_DIR    = doc/source
 DOC_TMP    = $(DOC_DIR)/tmp
 DOC_STATUS = @DOC_STATUS@
 TIDY       = tidy -modify -indent -wrap 78 --tidy-mark no
-RSYNC	   = rsync -av -c
+RSYNC	   = rsync -av -c --chmod=D755,F644
 
 # Program to do LF->CRLF
 DOSFILTER  = $(PERL) -p -e 's/\n/\r\n/'
@@ -531,7 +531,7 @@ dok-webserver:
 	s/__copy/©/;\
 	s@(<SUB)@<p style="text-align: center">\1@; s@(</SUB)@\1></p@;\
         s@ChameleonJohn@<br><a href="http://www.chameleonjohn.com/"><img align="middle"\
- src="images/sponsors/chameleonjohn.png" alt="ChameleonJohn Coupons"></a>@' \
+ src="images/sponsors/chameleonjohn.png" alt="ChameleonJohn Coupons"></a><br>\n@' \
      doc/webserver/index.html && $(RM) doc/webserver/*.bak
 
 # privoxy-index.html for local documentation:
@@ -626,27 +626,17 @@ webserver: clean-editor-files
           upload=`find . -type f -a -not \( -path "*/CVS*" -o -path "*/results*" \)`; \
           $(TAR) cf - $$upload | $(SSH) shell.sourceforge.net 'cd $(WWW_ROOT)/htdocs/; tar xvm 2>&1 | grep -v timestamp'
 
-	@$(ECHO) Fixing permissions
-	@$(SSH) shell.sourceforge.net 'chmod -R 775 $(WWW_ROOT)/htdocs 2>/dev/null; true'
-	@$(SSH) shell.sourceforge.net 'find $(WWW_ROOT)/htdocs/ -type f | xargs chmod 664 2>/dev/null; true'
-
 web-actions:
 	@$(ECHO) Updating the actions on the webserver ...
 	@$(RSYNC) doc/webserver/actions/*.php shell.sourceforge.net:$(WWW_ROOT)/htdocs/actions
-	@$(ECHO) Enforcing reasonable permissions ...
-	@$(SSH) shell.sourceforge.net 'find $(WWW_ROOT)/htdocs/actions/ -type f | xargs chmod 664 2>/dev/null'
 
 web-faq:
 	@$(ECHO) Updating the FAQ on the webserver ...
 	@$(RSYNC) doc/webserver/faq/*.html shell.sourceforge.net:$(WWW_ROOT)/htdocs/faq
-	@$(ECHO) Enforcing reasonable permissions ...
-	@$(SSH) shell.sourceforge.net 'find $(WWW_ROOT)/htdocs/faq/ -type f | xargs chmod 664 2>/dev/null'
 
 web-user-manual:
 	@$(ECHO) Updating the user manual on the webserver (do not use in case of version changes) ...
 	@$(RSYNC) doc/webserver/user-manual/*.html shell.sourceforge.net:$(WWW_ROOT)/htdocs/user-manual/
-	@$(ECHO) Enforcing reasonable permissions ...
-	@$(SSH) shell.sourceforge.net 'find $(WWW_ROOT)/htdocs/user-manual/ -type f | xargs chmod 664 2>/dev/null'
 
 #############################################################################
 #