X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=aabeeddb7d0442b00496a5e2425f58aa7170f64e;hp=f457703c1c843010a75f72baf0dad89830132d0a;hb=76854d3d47c7d1b050ed9c8a1f3bb429e1396e27;hpb=67531cf995def935da41ee91ccb7e356cac876eb

diff --git a/GNUmakefile.in b/GNUmakefile.in
index f457703c..aabeeddb 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.230 2015/01/24 16:40:07 fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.234 2016/02/02 13:08:03 fabiankeil Exp $
 #
 # Written by and Copyright (C) 2001-2014 members of the
 # Privoxy team. http://www.privoxy.org/
@@ -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
+RSYNC	   = rsync -av -c
 
 # Program to do LF->CRLF
 DOSFILTER  = $(PERL) -p -e 's/\n/\r\n/'
@@ -258,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
@@ -557,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
@@ -591,7 +580,7 @@ generate-config-file:
 #
 # Webserver
 #
-# moves dokumentation to webserver
+# moves documentation to webserver
 #
 #############################################################################
 sf-shell: