- Note that the "100% cpu problem" is worth

[privoxy.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 02e8a52..284238c 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.165 2008/05/22 16:57:23 fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.167 2008/05/23 14:39:09 fabiankeil Exp $
 #
 # Written by and Copyright (C) 2001 - 2007 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -672,9 +672,9 @@ dok-user:
        $(RM) -r doc/source/user-manual/
        mkdir -p doc/text doc/source/user-manual
        cd doc/source/user-manual && $(DB) -iuser-man ../user-manual.sgml && cd .. && cp user-manual/*.html ../webserver/user-manual/
-       @#FIXME: temp fix so same stylesheet gets in more than one place so it works \
-       @# for all doc set-ups, including the 'user manual' config option in local \
-       @#system where it MUST be in same directory as html.
+       # FIXME: temp fix so same stylesheet gets in more than one place so it works
+       # for all doc set-ups, including the 'user manual' config option in local
+       # system where it MUST be in same directory as html.
        $(PERL) -pi.bak -e 's/<\/head/\n<LINK REL=\"STYLESHEET\" TYPE=\"text\/css\" HREF=\"p_doc.css\">\n<\/head/i' doc/webserver/user-manual/*html
        cd doc/source && $(DB) -iuser-man -V nochunks user-manual.sgml > tmp.html && env -u LANG $(WDUMP) tmp.html > ../text/user-manual.txt && $(RM) -r tmp.html user-manual
 
@@ -743,7 +743,7 @@ dok-readme: dok-release
 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 consumers reduce unwanted junk email and protect their privacy from direct marketing companies.\"><\/HEAD/;\
+       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;/'\
@@ -753,7 +753,7 @@ dok-webserver:
 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 consumers reduce unwanted junk email and protect their privacy from direct marketing companies.\"><\/HEAD/;\
+       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;/' \
@@ -852,7 +852,7 @@ dok-pdf: dok-shtml
 # requires the shell util 'fmt'.
 config-file: dok-release
        cd doc/source && $(DB)-notoc -iconfig-file -V nochunks config.sgml > __tmp.html &&\
-       w3m -dump __tmp.html |fmt -w 70 > ../../config.new && $(RM) -r __tmp.*
+       env -u LANG w3m -dump __tmp.html | fmt -w 70 > ../../config.new && $(RM) -r __tmp.*
        $(PERL) -pi.bak \
                -e 's/^1\. \@\@TITLE\@\@/     /i;'              \
                -e '/^\d\.\d\.\s+/ && tr/[a-z]/[A-Z]/;'         \
@@ -864,7 +864,6 @@ config-file: dok-release
                -e '            {print "=";}'                   \
                -e '    print "\n";'                            \
                -e '};'                                         \
-               -e 'my $$hit_header;'                           \
                -e '$$hit_header=0;'                            \
                -e '$$hit_header=1 if m/^(\d\.)(\d\.)(\d\.)?\s/ && s/^(\d\.)//;'\
                -e '$$header_len = length($$_);'                \
@@ -1372,6 +1371,14 @@ coffee:
 ## end:
 
 # $Log: GNUmakefile.in,v $
+# Revision 1.167  2008/05/23 14:39:09  fabiankeil
+# Silence dok-user complaint about @# not being found.
+#
+# Revision 1.166  2008/05/23 14:04:57  fabiankeil
+# - Get config-file target working with more recent Perl
+#   versions. The generated file is still messed up, though.
+# - Fix comment typo.
+#
 # Revision 1.165  2008/05/22 16:57:23  fabiankeil
 # Fix coffee machine.
 #