X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=GNUmakefile.in;h=284238c7cc06b23b7e1484dcab214f58b43e72c8;hb=ce921028f16077b9a2ad87021ec8cb47dce71a72;hp=ae42c5414b7152438d71ec4fb69bb4ec8087d83e;hpb=240185cb82c45519ab9ad4b2a112ac3fb7592822;p=privoxy.git diff --git a/GNUmakefile.in b/GNUmakefile.in index ae42c541..284238c7 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.163 2008/05/04 18:01:53 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\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<\/HEAD/;\ + s/<\/HEAD/\n<\/HEAD/;\ s/<\/HEAD/\n<\/HEAD/;\ s/\.\d\. //;\ s/__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<\/HEAD/;\ + s/<\/HEAD/\n<\/HEAD/;\ s/<\/HEAD/\n<\/HEAD/;\ s/\.\d\. //;\ s/__copy/©/' \ @@ -849,30 +849,31 @@ dok-pdf: dok-shtml # 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'. 2007-11-14: note the perl below dies -# with perl 5.8.8. The same code pasted into a free standing script, -# without the makefile-isms, works fine. +# 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.* - $(PERL) -pi.bak -e 's/^1\. \@\@TITLE\@\@/ /i;\ - /^\d\.\d\.\s+/ && tr/[a-z]/[A-Z]/;\ - my $$hit_header;\ - $$header_len=0 unless $$hit_header;\ - if ($$hit_header) {\ - print "# ";\ - for ($$i=1; $$i < $$header_len; $$i++) {print "=";}\ - print "\n";\ - };\ - my $$hit_header;\ - $$hit_header=0;\ - $$hit_header=1 if m/^(\d\.)(\d\.)(\d\.)?\s/ && s/^(\d\.)//;\ - $$header_len = length($$_);\ - s/^/# /; /^# #{12,}/ && s/^# #/####/;\ - s/^.*$$// if $$hit_option;\ - $$hit_option=0;\ - s/^\n//; s/^#\s*-{20,}//; s/ *$$//;\ - $$hit_option=1 if s/^#\s+@@//;' config.new + 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]/;' \ + -e 'my $$hit_header;' \ + -e '$$header_len=0 unless $$hit_header;' \ + -e 'if ($$hit_header) {' \ + -e ' print "# ";' \ + -e ' for ($$i=1; $$i < $$header_len; $$i++)' \ + -e ' {print "=";}' \ + -e ' print "\n";' \ + -e '};' \ + -e '$$hit_header=0;' \ + -e '$$hit_header=1 if m/^(\d\.)(\d\.)(\d\.)?\s/ && s/^(\d\.)//;'\ + -e '$$header_len = length($$_);' \ + -e 's/^/# /; /^# #{12,}/ && s/^# #/####/;' \ + -e 's/^.*$$// if $$hit_option;' \ + -e '$$hit_option=0;' \ + -e 's/^\n//;' \ + -e 's/^#\s*-{20,}//;' \ + -e 's/ *$$//;' \ + -e '$$hit_option=1 if s/^#\s+@@//;' config.new $(RM) *.bak @$(ECHO) "****************************************************" @@ -884,7 +885,7 @@ config-file: dok-release @$(ECHO) "probably got hammered." @$(ECHO) "****************************************************" -# config file, alternate verison using lynx (perl stuff unfinished). Lynx +# config file, alternate version using lynx (perl stuff unfinished). Lynx # does not do so good a job. config-file-alt: cd doc/source && $(ECHO) -e ".h2 JUSTIFY\\nJUSTIFY:FALSE" > __tmp.lynx_cfg &&\ @@ -1355,11 +1356,13 @@ uninstall: CONF_DEST LOG_DEST PID_DEST check_doc @$(ECHO) Privoxy uninstalled, bye coffee: - @perl -e 'print pack "C*", (31,139,8,8,153,63,226,60,2,3,99,111,102,102,101,101,0,109,143,205,13,192,32,8,133,\ - 239,78,241,110,234,1,28,160,171,152,208,53,26,117,247,22,165,73,137,125,9,1,62,126,2,128,169,5,243,143,\ - 13,139,49,164,65,100,149,152,102,73,141,88,73,178,116,205,100,69,253,36,102,81,49,83,236,19,225,171,131,\ - 214,172,163,73,4,168,123,115,71,126,247,122,94,128,178,227,95,154,12,86,215,122,197,249,146,187,54,220,125,\ - 193,51,228,11,1,0,0);'|zcat + @perl -e 'print pack "C*", (31,139,8,8,153,63,226,60,2,3,99,111,102,102,101,' \ + -e '101,0,109,143,205,13,192,32,8,133,239,78,241,110,234,1,28,160,171,' \ + -e '152,208,53,26,117,247,22,165,73,137,125,9,1,62,126,2,128,169,5,243,' \ + -e '143,13,139,49,164,65,100,149,152,102,73,141,88,73,178,116,205,100,' \ + -e '69,253,36,102,81,49,83,236,19,225,171,131,214,172,163,73,4,168,123,' \ + -e '115,71,126,247,122,94,128,178,227,95,154,12,86,215,122,197,249,146,' \ + -e '187,54,220,125,193,51,228,11,1,0,0);' | zcat ############################################################################# @@ -1368,6 +1371,21 @@ 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. +# +# Revision 1.164 2008/05/22 10:26:26 fabiankeil +# - Remove parsers.@OBJEXT@'s dependency on encode.h. +# - Include Emacs backup files in tidy target again. +# # Revision 1.163 2008/05/04 18:01:53 fabiankeil # Dependency fixes: cgisimple.c and filters.c depend on urlmatch.h. #