Rebuild docs with recent changes

[privoxy.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 772609f..c82dd2f 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.232 2016/01/22 11:31:15 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/'
@@ -257,7 +258,7 @@ all: $(PROGRAM) default.action
 #############################################################################
 # Phony targets
 #############################################################################
-.PHONY: all inifiles solaris-dist \
+.PHONY: all inifiles \
 win-dist tarball-dist dok webserver clean clobber tags \
 install CONF_DEST LOG_DEST \
 PID_DEST check_doc install-strip uninstall GROUP_T
@@ -556,17 +557,6 @@ dok-release:
        fi;
        $(RM) -r doc/source/*bak doc/source/*/*bak;
 
-# Create release announcement in text and html, with short and long versions.
-# This is a standalone target, and must be invoked directly.
-# announce: dok-release
-#      mkdir -p $(DOC_TMP)
-#      cd $(DOC_TMP) && cp -f ../announce.sgml . && $(DB) -iannounce-big announce.sgml &&\
-#      mv -f index.html announce.html && $(W3M_DUMP) announce.html > announce.txt
-#      cd $(DOC_TMP) && $(DB) announce.sgml &&\
-#      mv -f index.html announce-mini.html && $(W3M_DUMP) announce-mini.html > announce-mini.txt &&\
-#      mv -f *html *txt ../../..
-#      rm -fr $(DOC_TMP)
-
 # The main Privoxy config file, generated from sgml sources.
 # NOTE: This will require some hand editing.
 config-file: dok-release generate-config-file
@@ -586,15 +576,6 @@ generate-config-file:
        $(W3M_DUMP) -cols 67 config.html > config
        $(PERL) -i.bak utils/prepare-configfile.pl config
 
-# config file, alternate version using lynx (perl stuff unfinished). Lynx
-# does not do so good a job.
-config-file-alt:
-       cd doc/source && $(ECHO) -e ".h2 JUSTIFY\\nJUSTIFY:FALSE" > __tmp.lynx_cfg &&\
-       $(DB)-notoc -iconfig-file -V nochunks config.sgml > __tmp.html &&\
-       lynx -cfg=__tmp.lynx_cfg -width=78 -dump __tmp.html > ../../config.new && $(RM) -r __tmp.*
-       $(PERL) -pi -e 's/^(   )//;\
-                       s/:$\/:\n/' config.new
-
 #############################################################################
 #
 # Webserver
@@ -633,24 +614,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: