Factor out set_no_delay_flag() to reduce code duplication

[privoxy.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 772609f..6fac868 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,8 +1,8 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.224 2014/10/21 15:29:34 fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.229 2015/01/24 16:39:53 fabiankeil Exp $
 #
-# Written by and Copyright (C) 2001-2013 members of the
+# Written by and Copyright (C) 2001-2014 members of the
 # Privoxy team. http://www.privoxy.org/
 #
 # Based on the Internet Junkbuster originally written
@@ -144,6 +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
 
 # Program to do LF->CRLF
 DOSFILTER  = $(PERL) -p -e 's/\n/\r\n/'
@@ -633,24 +634,32 @@ webserver: clean-editor-files
        @$(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: clean-editor-files
-       @$(ECHO) Uploading
-       @cd doc/webserver/actions; \
-          upload=`find . -type f -a -not \( -path "*/CVS*" -o -path "*/results*" \)`; \
-          $(TAR) cf - $$upload | $(SSH) ijbswa.sourceforge.net 'cd $(WWW_ROOT)/htdocs/actions; tar xvm'
+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'
 
-       @$(ECHO) Fixing permissions
-       @$(SSH) ijbswa.sourceforge.net 'find $(WWW_ROOT)/htdocs/actions/ -type f | xargs chmod 664 2>/dev/null'
-       @$(SSH) ijbswa.sourceforge.net 'chmod 666 $(WWW_ROOT)/htdocs/actions/results/actions-feedback.txt 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'
 
 #############################################################################
 #
 # Try to clean up the generated HTML files.
 #
-# The files are a such a mess that some of them require two tidy runs
-# in row as the first abort prematurely. The vanilla tidy output renders
-# poorly as it contains a bit too much white-space, so we additionally run
-# the files through perl to fix this again.
+# The files are such a mess that some of them require two tidy runs in a
+# row as the first one aborts prematurely. The vanilla tidy output renders
+# poorly because it contains a bit too much whitespace, so we additionally
+# run the files through perl to fix this again.
 #
 #############################################################################
 dok-tidy: