X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=b57d5a469a0105ebe0fc5854a461ff80c62fcb99;hp=5aed5937a13be9fe29e7624957bce9b4626249fc;hb=602c3c858a4fc7cedea051aef516520e2bb12aa0;hpb=25948b073495baf0ad639352113b6ec722da11ed

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 5aed5937..b57d5a46 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.106 2002/05/26 04:55:11 mal0rd Exp $
+# $Id: GNUmakefile.in,v 1.108 2002/05/28 03:56:08 hal9 Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -80,12 +80,15 @@ LN         = ln
 WDUMP      = @WDUMP@ -dump
 JADECAT    = @JADECAT@
 JADEBIN    = @JADEBIN@
+# Note: Please make sure that -d ldp.dsl\#html stays the last option to
+#       $(JADEBIN), because for some targets "-notoc" will be appended
+#       to it (--> "ldp.dsl\#html-notoc"). 
 DB         = $(JADEBIN) $(JADECAT) -ihtml -t sgml  -D.. -d ldp.dsl\#html
 MAN2HTML   = @MAN2HTML@
 G2H_CMD    = groff -mandoc -Thtml
 TARGET_OS  = @host@
 PERL       = perl
-DOC_DIR	 = doc/source
+DOC_DIR    = doc/source
 DOC_TMP    = $(DOC_DIR)/tmp
 
 
@@ -607,17 +610,29 @@ dok-readme: ensure-dkprefix ensure-jadebin ensure-wdump
 	cd doc/source && $(DB)-notoc -V nochunks readme.sgml > tmp.html &&\
 	$(WDUMP) tmp.html > ../../README && $(RM) -r tmp.html
 
-# webserver files
-dok-webserver: ensure-dkprefix ensure-jadebin
-	cd doc/source/webserver && $(DB)-notoc -V nochunks index.sgml > ../../webserver/index.html
+# index.sgml is used to create both the Home Page, and a local index
+# for documentation, etc.
+#
+# index.html for webserver:
+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="MSSmartTagsPreventParsing" content="TRUE"><\/HEAD/;\
+	s/\.\d\. //'\
+     doc/webserver/index.html && $(RM) doc/webserver/*.bak
+
+# privoxy-index.html for local documentation:
+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="MSSmartTagsPreventParsing" content="TRUE"><\/HEAD/;\
 	s/\.\d\. //'\
-     doc/webserver/index.html && $(RM) doc/source/webserver/*.bak
+     doc/webserver/privoxy-index.html && $(RM) doc/webserver/*.bak
 
 # Main documentation target.
-dok: dok-devel dok-release dok-user dok-faq dok-readme dok-webserver dok-authors
+dok: dok-devel dok-release dok-user dok-faq dok-readme dok-webserver dok-authors dok-index
 	@$(ECHO) Documentation created.
 
 #
@@ -871,6 +886,15 @@ coffee:
 ## end:
 
 # $Log: GNUmakefile.in,v $
+# Revision 1.108  2002/05/28 03:56:08  hal9
+# make dok-index target for privoxy-index.html. Fix *bak dead soldiers in
+# doc/webserver.
+#
+# Revision 1.107  2002/05/27 23:26:33  mal0rd
+# Made doc-generation configuration automatic.
+# References to DB2HTML were removed, not used.
+# --with-docbook now only needed if in odd path.
+#
 # Revision 1.106  2002/05/26 04:55:11  mal0rd
 # Added debian-dist and debian-upload targets.  Also documented usage.
 #