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

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 76e9e9ea..58002f20 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,8 +1,8 @@
 # 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.213 2013/01/09 15:06:30 fabiankeil Exp $
 #
-# Written by and Copyright (C) 2001-2011 members of the
+# Written by and Copyright (C) 2001-2013 members of the
 # Privoxy team. http://www.privoxy.org/
 #
 # Based on the Internet Junkbuster originally written
@@ -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
@@ -573,23 +571,20 @@ dok-release:
 # 	rm -fr $(DOC_TMP)
 
 # 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'.
+# NOTE: This will require some hand editing.
 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.*
-	$(PERL) -i.bak utils/prepare-configfile.pl config.new
+	env -u LANG LC_ALL=C w3m -dump -cols 67 __tmp.html > ../../config && $(RM) __tmp.*
+	$(PERL) -i.bak utils/prepare-configfile.pl config
 
 	$(RM) *.bak
 	@$(ECHO)  "****************************************************"
-	@$(ECHO)  "The output file is config.new."
-	@$(ECHO)  "Now -- you need to hand edit the results!!!"
+	@$(ECHO)  "The config file has been optimistically updated"
+	@$(ECHO)  "Now -- you may need to hand edit the results!"
 	@$(ECHO)  "In particular, check the Debug levels, the"
 	@$(ECHO)  "permit-access, forward & socks examples and the"
 	@$(ECHO)  "various user-manual examples, which all"
-	@$(ECHO)  "probably got hammered."
+	@$(ECHO)  "might have gotten hammered."
 	@$(ECHO)  "****************************************************"
 
 # config file, alternate version using lynx (perl stuff unfinished). Lynx