New target 'make dok-index' for privoxy-index.html. Also, fixed *.bak files

not being cleaned up in doc/webserver.

diff --git a/GNUmakefile.in b/GNUmakefile.in
index dd08968..db01200 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.104 2002/05/24 00:03:49 oes Exp $
+# $Id: GNUmakefile.in,v 1.104.2.1 2002/05/26 17:19:34 hal9 Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -575,17 +575,30 @@ dok-readme:
        cd doc/source && $(DB)-notoc -V nochunks readme.sgml > tmp.html &&\
        $(WDUMP) tmp.html > ../../README && $(RM) -r tmp.html
 
-# webserver files
+# 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 -V nochunks index.sgml > ../../webserver/index.html
+       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-release dok-devel dok-user dok-faq dok-readme dok-webserver dok-authors
+dok: dok-release dok-devel dok-user dok-faq dok-readme dok-webserver dok-authors dok-index
        @$(ECHO) Documentation created.
 
 #
@@ -839,6 +852,9 @@ coffee:
 ## end:
 
 # $Log: GNUmakefile.in,v $
+# Revision 1.104.2.1  2002/05/26 17:19:34  hal9
+# Remove Table of Contents from readme with oes's dsl trick.
+#
 # Revision 1.104  2002/05/24 00:03:49  oes
 # Use p_doc.css for the Homepage for consistency
 #