X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=a71c816a8c32cd428f7b5c9c0bc51e206c7c86e1;hp=76e9e9ea08df96bc2279db0c037d85aed09ea7d9;hb=3a9f57f2f4342f267af2caed311fd1cc17f7ea6a;hpb=f7020148feda7d2ffbf1dde051a2fc870e5c2678

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 76e9e9ea..a71c816a 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.204 2011/09/06 18:45:28 fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.211 2013/01/09 15:04:41 fabiankeil Exp $
 #
 # Written by and Copyright (C) 2001-2011 members of the
 # Privoxy team. http://www.privoxy.org/
@@ -86,7 +86,7 @@ INSTALL    = @INSTALL@
 # Binaries
 BIN_MODE	 = 0755
 # Support files, docs, etc.
-RA_MODE   = 0664
+RA_MODE   = 0644
 # Directory
 DIR_MODE   = 0755
 # Files daemon writes to.
@@ -142,7 +142,7 @@ PERL       = perl
 DOC_DIR    = doc/source
 DOC_TMP    = $(DOC_DIR)/tmp
 DOC_STATUS = @DOC_STATUS@
-TIDY       = tidy -modify -indent -clean -wrap 78
+TIDY       = tidy -modify -indent -wrap 78 --tidy-mark no
 
 # Program to do LF->CRLF
 #
@@ -516,7 +516,6 @@ dok-webserver:
 	cd doc/source/webserver && $(DB)-notoc -ip-homepage -V nochunks index.sgml > ../../webserver/index.html
 	$(PERL) -pi.bak -e 's/..\/p_doc.css/p_doc.css/;\
 	s/<\/HEAD/\n<meta name=\"description\" content=\"Privoxy helps users to protect their privacy.\"><\/HEAD/;\
-	s/<\/HEAD/\n<meta name="MSSmartTagsPreventParsing" content="TRUE"><\/HEAD/;\
 	s/\.\d\. //;\
 	s/__copy/&copy;/'\
      doc/webserver/index.html && $(RM) doc/webserver/*.bak
@@ -526,7 +525,6 @@ dok-index:
 	cd doc/source/webserver && $(DB)-notoc -ip-index -V nochunks index.sgml > ../../webserver/privoxy-index.html
 	$(PERL) -pi.bak -e 's/..\/p_doc.css/p_doc.css/;\
 	s/<\/HEAD/\n<meta name=\"description\" content=\"Privoxy helps users to protect their privacy.\"><\/HEAD/;\
-	s/<\/HEAD/\n<meta name="MSSmartTagsPreventParsing" content="TRUE"><\/HEAD/;\
 	s/\.\d\. //;\
 	s/__copy/&copy;/' \
      doc/webserver/privoxy-index.html && $(RM) doc/webserver/*.bak
@@ -575,11 +573,10 @@ dok-release:
 # The main Privoxy config file, generated from sgml sources.
 # NOTE: This will require some hand editing. The new file is outputted
 # as config.new so that problem sections can be compared to previous
-# version. This is hardcored to w3m for html/text conversion. Also,
-# requires the shell util 'fmt'.
+# version. This is hardcored to w3m for html/text conversion.
 config-file: dok-release
 	cd doc/source && $(DB)-notoc -iconfig-file -V nochunks config.sgml > __tmp.html &&\
-	env -u LANG w3m -dump __tmp.html | fmt -w 70 > ../../config.new && $(RM) -r __tmp.*
+	env -u LANG LC_ALL=C w3m -dump -cols 67 __tmp.html > ../../config.new && $(RM) __tmp.*
 	$(PERL) -i.bak utils/prepare-configfile.pl config.new
 
 	$(RM) *.bak