" > doc/webserver/man-page/privoxy-man-page.html
@@ -583,32 +571,27 @@ else
endif
# readme page
-dok-readme: doc/source/ldpOK.dsl
+dok-readme:
cd doc/source && $(DB) -V nochunks readme.sgml > tmp.html &&\
$(WDUMP) tmp.html > ../../README && $(RM) -r tmp.html
# webserver files
-dok-webserver: doc/source/ldpOK.dsl
+dok-webserver:
cd doc/source/webserver && $(DB) -V nochunks index.sgml > ../../webserver/index.html
$(PERL) -pi.bak -e 's/..\/p_doc.css/p_web.css/;\
s/<\/HEAD/\n<\/HEAD/;\
- s/<\/HEAD/\n<\/HEAD/'\
+ s/<\/HEAD/\n<\/HEAD/;\
+ s/\.\d\. //'\
doc/webserver/index.html && $(RM) doc/source/webserver/*.bak
# Main documentation target.
dok: dok-release dok-devel dok-user dok-faq dok-readme dok-webserver dok-authors
-# kludge to force recreation on next run. Rodrigo? -swa
-# I see no need for it, but no problem either. Let it stay. -morcego
- @$(RM) doc/source/ldpOK.dsl
@$(ECHO) Documentation created.
#
# an alternative to the above dok. disabled man page creation for the moment
#
redhat-dok: dok-release dok-devel dok-user dok-faq redhat-readme dok-webserver dok-authors
-# kludge to force recreation on next run. Rodrigo? -swa
-# I see no need for it, but no problem either. Let it stay. -morcego
- @$(RM) doc/source/ldpOK.dsl
@$(ECHO) Documentation created.
# For those with man2html ala RH7's.
@@ -624,25 +607,25 @@ else
$(MAKE) groff2html
endif
+# Otherwise we get plain groff conversion.
+groff2html:
+ $(G2H_CMD) ./privoxy.1 | $(SED) -e 's@@@' > doc/webserver/man-page/privoxy-man-page.html
+
## Make README
-redhat-readme: doc/source/ldpOK.dsl
+redhat-readme:
cd doc/source && $(DB) -V nochunks readme.sgml > tmp.html && $(WDUMP) \
tmp.html > ../../README && $(RM) -r tmp.html
- # kludge to force recreation on next run. Rodgrigo?
- @$(RM) doc/source/ldpOK.dsl
## Make AUTHORS file
-dok-authors: doc/source/ldpOK.dsl
+dok-authors:
cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && $(WDUMP) \
tmp.html > ../../AUTHORS && $(RM) tmp.html
- # kludge to force recreation on next run. Rodgrigo?
- @$(RM) doc/source/ldpOK.dsl
# make a man page, and then (lousy) HTML version.
# 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
+man:
mkdir -p doc/source/man
cd doc/source/man && docbook2man ../privoxy-man-page.sgml &&\
perl -pi.bak -e 's/ //; s/\[ /\[/g' privoxy.1
@@ -651,8 +634,6 @@ man: doc/source/ldpOK.dsl
# This html is not used. See make man2html.
mv -f doc/source/man/privoxy.1 privoxy.1
$(MAKE) man2html
- # kludge to force recreation on next run. Rodgrigo?
- @$(RM) -r doc/source/ldpOK.dsl doc/source/man
# Set doc entities for VERSION and CODE_STATUS in sgml docs. Toggle content
# exceptions accordingly. This needs to go before any doc building (doh).
@@ -676,26 +657,33 @@ else
$(RM) -r doc/source/*bak doc/source/*/*bak
endif
-dok-pdf: doc/source/ldpOK.dsl dok-release
+dok-pdf: dok-release
$(RM) doc/pdf/*.pdf
cp -f doc/source/*.sgml doc/pdf
cp -f doc/source/*.dsl doc/pdf
- cd doc/pdf && db2pdf --pdf -s ldpOK.dsl user-manual.sgml && mv user-manual.pdf privoxy-user-manual.pdf > /dev/null 2>&1
- cd doc/pdf && db2pdf --pdf -s ldpOK.dsl developer-manual.sgml && mv developer-manual.pdf privoxy-developer-manual.pdf > /dev/null 2>&1
- cd doc/pdf && db2pdf --pdf -s ldpOK.dsl faq.sgml && mv faq.pdf privoxy-faq.pdf > /dev/null 2>&1
+ cd doc/pdf && db2pdf --pdf -s ldp.dsl user-manual.sgml && mv user-manual.pdf privoxy-user-manual.pdf > /dev/null 2>&1
+ cd doc/pdf && db2pdf --pdf -s ldp.dsl developer-manual.sgml && mv developer-manual.pdf privoxy-developer-manual.pdf > /dev/null 2>&1
+ cd doc/pdf && db2pdf --pdf -s ldp.dsl faq.sgml && mv faq.pdf privoxy-faq.pdf > /dev/null 2>&1
$(RM) doc/pdf/*.sgml doc/pdf/*.dsl doc/pdf/*.out doc/pdf/*.tex doc/pdf/*.log doc/pdf/*.aux
- # kludge to force recreation on next run. Rodgrigo?
- @$(RM) doc/source/ldpOK.dsl
# the layout and style with db2pdf sucks, here is an alternative
-dok-pdf2: doc/source/ldpOK.dsl dok-release
+dok-pdf2: dok-release
mkdir -p doc/source/temp # this directory not in cvs
cd doc/source && $(DB) -V nochunks user-manual.sgml > temp/privoxy-user-manual.html
cd doc/source && $(DB) -V nochunks developer-manual.sgml > temp/privoxy-developer-manual.html
cd doc/source && $(DB) -V nochunks faq.sgml > temp/privoxy-faq.html
# one could use html2ps and ps2pdf. well, that does not work. htmlps produces incorrect output.
- # kludge to force recreation on next run. Rodgrigo?
- @$(RM) doc/source/ldpOK.dsl
+
+# Create release announcement in text and html, with short and long versions.
+# This is a standalone target, and must be invoked directly.
+announce: dok-release
+ mkdir -p $(DOC_TMP)
+ cd $(DOC_TMP) && cp -f ../announce.sgml . && $(DB) -iannounce-big announce.sgml &&\
+ mv -f index.html announce.html && $(WDUMP) announce.html > announce.txt
+ cd $(DOC_TMP) && $(DB) announce.sgml &&\
+ mv -f index.html announce-mini.html && $(WDUMP) announce-mini.html > announce-mini.txt &&\
+ mv -f *html *txt ../../..
+ rm -fr $(DOC_TMP)
#############################################################################
#
@@ -805,7 +793,8 @@ tidy:
$(RM) `find . -name ".\#*"`
clobber: tidy
- $(RM) GNUmakefile configure config.h.in config.h config.cache config.status config.log logfile privoxy.log core *.tar.gz *.tar privoxy-cl.spec doc/source/ldpOK.dsl
+ $(RM) GNUmakefile configure config.h.in config.h config.cache config.status config.log logfile \
+ privoxy.log core *.tar.gz *.tar privoxy-cl.spec doc/source/ldp.dsl
#
# FIXME: What is all this?
@@ -836,6 +825,12 @@ install: all
# FIXME: Need new manual! $(GZIP_PROG) -c privoxy.1 > $(MAN_DEST)/privoxy.1.gz
$(INSTALL) $(INSTALL_P) privoxy.init /etc/init.d/privoxy
+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
#############################################################################
@@ -844,6 +839,23 @@ install: all
## end:
# $Log: GNUmakefile.in,v $
+# Revision 1.101 2002/05/15 12:28:46 oes
+# Trying to keep Hal happy :)
+#
+# Revision 1.100 2002/05/08 13:48:18 hal9
+# Ooops, that trashed JB v2.0.2 comment. Fixed.
+#
+# Revision 1.99 2002/05/08 13:42:07 hal9
+# This fixes the numbering problem on index.html in contact info section (.1.). Using
+# perl, since its way too convoluted to try to fix proper with docbook.
+#
+# Revision 1.98 2002/05/03 14:33:06 oes
+# Replaced ldp(OK).dsl handling with generation via autoconf; handle all file exeptions to src tarball via find
+#
+# Revision 1.97 2002/04/27 20:27:43 swa
+# no longer needed due to new
+# PACKAGE_VERSION process
+#
# Revision 1.96 2002/04/27 17:44:32 morcego
# - Correcting typo in my name (Rodrigo, not Rodgrigo) :-)
# - Using the RM macro everywhere rm is called (either we use, or don't)