X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=10d57c1a12ef0e0e288e173b2e6e5ff681ac6811;hp=9a613688227becadf8afd8c7e96217d872ffa79e;hb=d69fd4bba3ef5822a59c7c55ba578ef5bf6eb99e;hpb=0b537fe533a75e4ea2b575e3479c3aab7f9fcf1d diff --git a/GNUmakefile.in b/GNUmakefile.in index 9a613688..10d57c1a 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.82 2002/04/11 21:07:11 oes Exp $ +# $Id: GNUmakefile.in,v 1.86 2002/04/15 04:30:27 hal9 Exp $ # # Written by and Copyright (C) 2001 the SourceForge # Privoxy team. http://www.privoxy.org/ @@ -82,7 +82,7 @@ LN = ln WDUMP = @WDUMP@ -dump JADECAT = @JADECAT@ JADEBIN = @JADEBIN@ -DB = $(JADEBIN) $(JADECAT) -t sgml -ihtml -D.. -d ldpOK.dsl\#html +DB = $(JADEBIN) $(JADECAT) -ihtml -t sgml -D.. -d ldpOK.dsl\#html DB2HTML = @DB2HTML@ DKPREFIX = @DKPREFIX@ MAN2HTML = @MAN2HTML@ @@ -557,13 +557,12 @@ dok-readme: doc/source/ldpOK.dsl # webserver files dok-webserver: doc/source/ldpOK.dsl cd doc/source/webserver && $(DB) -V nochunks index.sgml > ../../webserver/index.html - $(PERL) -pi -e 's/..\/p_doc.css/p_web.css/;\ + $(PERL) -pi.bak -e 's/..\/p_doc.css/p_web.css/;\ s/<\/HEAD/\n<\/HEAD/;\ s/<\/HEAD/\n<\/HEAD/'\ - doc/webserver/index.html + doc/webserver/index.html && rm -f doc/source/webserver/*.bak -# Removed dok-man 04/08/02, hal. Added authors and dok-release. And -# dok-webserver! +# Main documentation target. dok: dok-release dok-devel dok-user dok-faq dok-readme dok-webserver authors # kludge to force recreation on next run. Rodgrigo? @rm -f doc/source/ldpOK.dsl @@ -582,10 +581,10 @@ man2html: mkdir -p doc/webserver/man-page ifneq ($(MAN2HTML),false) $(MAN2HTML) privoxy.1 |grep -v "^Content-type" > tmp.html - $(PERL) -pi -e 's///; s//man2html/' tmp.html - $(PERL) -pi -e 's/(<\/HEAD>)/<\/HEAD>/' tmp.html -# Get rid of spurious  from converion. (How to do this with perl?) - $(SED) -e 's///g' tmp.html > doc/webserver/man-page/privoxy-man-page.html && rm -f tmp.html + $(PERL) -pi.bak -e 's///; s//man2html/' tmp.html + $(PERL) -pi.bak -e 's/(<\/HEAD>)/<\/HEAD>/' tmp.html +# Get rid of spurious  from conversion. (How to do this with perl?) + $(SED) -e 's///g' tmp.html > doc/webserver/man-page/privoxy-man-page.html && rm -f tmp.* else $(MAKE) groff2html endif @@ -605,14 +604,13 @@ authors: doc/source/ldpOK.dsl @rm -f doc/source/ldpOK.dsl # make a man page, and then (lousy) HTML version. -# Requires docbook2man (short perl script), see CVS -# http://sources.redhat.com/docbook-tools/. Also requires openjade and SGMLSpm -# perl module. This target is not invoked from other dok targets. It is -# built separately due to dependencies on perl scripts. +# Requires docbook2man (short perl script), see comments +# in privoxy-man-page.sgml. This target is not invoked from other dok targets. +# It is built separately due to dependencies on perl scripts. man: doc/source/ldpOK.dsl mkdir -p doc/source/man cd doc/source/man && docbook2man ../privoxy-man-page.sgml &&\ - perl -pi -e 's/ //; s/\[ /\[/g' privoxy.1 + perl -pi.bak -e 's/ //; s/\[ /\[/g' privoxy.1 cd doc/source/man && $(DB) ../privoxy-man-page.sgml &&\ mv -f index.html privoxy-man-page.html # This html is not used. See make man2html. @@ -623,23 +621,34 @@ man: doc/source/ldpOK.dsl # Set doc entities for VERSION and CODE_STATUS in sgml docs. Toggle content # exceptions accordingly. This needs to go before any doc building (doh). -make dok-release: +dok-release: @$(ECHO) Setting doc version and status to $(VERSION), $(CODE_STATUS) - @$(PERL) -pi -e 's///;\ + @$(PERL) -pi.bak -e 's///;\ s///' \ doc/source/*sgml doc/source/*/*sgml + rm -fr doc/source/*bak doc/source/*/*bak ifeq ($(CODE_STATUS),stable) @$(ECHO) Setting docs to stable $(VERSION) - @$(PERL) -pi -e 's///;\ + @$(PERL) -pi.bak -e 's///;\ s///' \ doc/source/*sgml doc/source/*/*sgml + rm -fr doc/source/*bak doc/source/*/*bak else @$(ECHO) Setting docs to not stable $(VERSION) - @$(PERL) -pi -e 's///;\ + @$(PERL) -pi.bak -e 's///;\ s///' \ doc/source/*sgml doc/source/*/*sgml + rm -fr doc/source/*bak doc/source/*/*bak endif +dok-pdf: doc/source/ldpOK.dsl dok-release + cp doc/source/*.sgml doc/pdf + cp doc/source/*.dsl doc/pdf + cd doc/pdf && db2pdf --pdf -s ldpOK.dsl user-manual.sgml && mv user-manual.pdf privoxy-user-manual.pdf + cd doc/pdf && db2pdf --pdf -s ldpOK.dsl developer-manual.sgml && mv developer-manual.pdf privoxy-developer-manual.pdf + cd doc/pdf && db2pdf --pdf -s ldpOK.dsl faq.sgml && mv faq.pdf privoxy-faq.pdf + rm -f doc/pdf/*.sgml doc/pdf/*.dsl doc/pdf/*.out doc/pdf/*.tex doc/pdf/*.log doc/pdf/*.aux + ############################################################################# # # Webserver @@ -786,6 +795,19 @@ install: all ## end: # $Log: GNUmakefile.in,v $ +# Revision 1.86 2002/04/15 04:30:27 hal9 +# Missed two -pi.bak's on perl/cygwin problem. +# +# Revision 1.85 2002/04/14 01:05:34 hal9 +# Revert dok-webserver change for SF logo. +# +# Revision 1.84 2002/04/13 22:43:25 hal9 +# -Fix dok-webserver for SF logo (more perl). +# -Change all perl -pi to perl -pi.bak for Cygwin problem. +# +# Revision 1.83 2002/04/12 09:39:25 oes +# Excluding yet more files from tarball; making dist warning yet more scary +# # Revision 1.82 2002/04/11 21:07:11 oes # Excluding more files from tarball build #