From: Fabian Keil <fk@fabiankeil.de>
Date: Thu, 10 Jan 2013 11:03:31 +0000 (+0000)
Subject: Change WDUMP to generate ASCII
X-Git-Tag: v_3_0_20~67
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=02381bd37513d2f1b79799528fcdf5fb1cd434f8

Change WDUMP to generate ASCII

Add WDUMP_UTF8 to allow UTF-8 in the AUTHORS file so the names are right.
---

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 58002f20..097f25e9 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.213 2013/01/09 15:06:30 fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.214 2013/01/09 15:08:51 fabiankeil Exp $
 #
 # Written by and Copyright (C) 2001-2013 members of the
 # Privoxy team. http://www.privoxy.org/
@@ -130,7 +130,8 @@ CHMOD      = chmod
 CHOWN      = chown
 CHGRP      = chgrp
 GROUPS     = groups
-WDUMP      = @WDUMP@ -dump
+WDUMP      = env -u LANG LC_ALL=C @WDUMP@ -dump
+WDUMP_UTF8 = @WDUMP@ -dump
 JADECAT    = @JADECAT@
 JADEBIN    = @JADEBIN@
 DB         = $(JADEBIN) $(JADECAT) -ihtml -t sgml  -D.. -d ldp.dsl\#html
@@ -503,9 +504,9 @@ groff2html:
 # readme page and INSTALL file
 dok-readme: dok-release
 	cd doc/source && $(DB)-notoc -V nochunks readme.sgml > tmp.html &&\
-	env -u LANG $(WDUMP) tmp.html > ../../README ;\
+	$(WDUMP) tmp.html > ../../README ;\
 	$(DB)-notoc -V nochunks install.sgml > tmp.html &&\
-	env -u LANG $(WDUMP) tmp.html > ../../INSTALL ;\
+	$(WDUMP) tmp.html > ../../INSTALL ;\
 	$(RM) tmp.*
 
 # index.sgml is used to create both the Home Page, and a local index
@@ -535,7 +536,7 @@ dok: dok-release dok-devel dok-user dok-faq dok-readme dok-webserver dok-authors
 
 ## Make AUTHORS file
 dok-authors:
-	cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && env -u LANG $(WDUMP) \
+	cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && $(WDUMP_UTF8) \
 	  tmp.html > ../../AUTHORS && $(RM) tmp.html
 
 # Set doc entities for VERSION and CODE_STATUS in sgml docs. Toggle content
@@ -574,7 +575,7 @@ dok-release:
 # 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 LC_ALL=C w3m -dump -cols 67 __tmp.html > ../../config && $(RM) __tmp.*
+	$(WDUMP) -cols 67 __tmp.html > ../../config && $(RM) __tmp.*
 	$(PERL) -i.bak utils/prepare-configfile.pl config
 
 	$(RM) *.bak