From 6ab98325f7675d1c2f125891da53dbcc01c5b77f Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Wed, 14 Apr 1999 14:04:39 +0000
Subject: [PATCH] Use the tools/mkdvi.sh script to generate DVI and PDF output
 for the library reference now that it's sufficiently capable.

---
 Doc/paper-letter/Makefile | 35 +++++++++++------------------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/Doc/paper-letter/Makefile b/Doc/paper-letter/Makefile
index 88049f10a42..dc1bb20e163 100644
--- a/Doc/paper-letter/Makefile
+++ b/Doc/paper-letter/Makefile
@@ -50,8 +50,10 @@ HOWTOSTYLES= ../texinputs/howto.cls \
 	$(COMMONSTYLES)
 
 
-$(DVIFILES):	  ../tools/fix_hack ../tools/mkdvi.sh $(COMMONTEX)
-$(PDFFILES):	  ../tools/fix_hack ../tools/mkdvi.sh $(COMMONTEX)
+SCRIPTS:	  ../tools/fix_hack ../tools/mkdvi.sh ../tools/indfix.py
+
+$(DVIFILES):	  $(SCRIPTS) $(COMMONTEX)
+$(PDFFILES):	  $(SCRIPTS) $(COMMONTEX)
 
 $(MANDVIFILES):	  $(MANSTYLES)
 $(MANPDFFILES):	  $(MANSTYLES)
@@ -77,28 +79,6 @@ README:	$(PSFILES)
 	$(TOOLSDIR)/getpagecounts >$@
 
 
-# Python Library Reference
-lib.dvi: $(TOOLSDIR)/indfix.py $(LIBFILES)
-	$(TOOLSDIR)/newind.py >lib.ind
-	$(TOOLSDIR)/newind.py modindex >modlib.ind
-	TEXINPUTS=../lib:$(TEXINPUTS) $(LATEX) lib
-	$(MAKEINDEX) modlib.idx
-	$(TOOLSDIR)/fix_hack lib.idx
-	$(MAKEINDEX) lib.idx
-	$(TOOLSDIR)/indfix.py lib.ind
-	TEXINPUTS=../lib:$(TEXINPUTS) $(LATEX) lib
-
-lib.pdf: $(TOOLSDIR)/indfix.py $(LIBFILES)
-	$(TOOLSDIR)/newind.py >lib.ind
-	$(TOOLSDIR)/newind.py modindex >modlib.ind
-	TEXINPUTS=../lib:$(TEXINPUTS) $(PDFLATEX) lib
-	$(MAKEINDEX) modlib.idx
-	$(TOOLSDIR)/fix_hack lib.idx
-	$(MAKEINDEX) lib.idx
-	$(TOOLSDIR)/indfix.py lib.ind
-	$(TOOLSDIR)/toc2bkm.py lib
-	TEXINPUTS=../lib:$(TEXINPUTS) $(PDFLATEX) lib
-
 # Python/C API Reference Manual
 api.dvi: $(APIFILES)
 	$(MKDVI) api
@@ -120,6 +100,13 @@ ext.dvi: $(EXTFILES)
 ext.pdf: $(EXTFILES)
 	$(MKPDF) ext
 
+# Python Library Reference
+lib.dvi: $(LIBFILES)
+	$(MKDVI) lib
+
+lib.pdf: $(LIBFILES)
+	$(MKPDF) lib
+
 # Macintosh Library Modules
 mac.dvi: $(MACFILES)
 	$(MKHOWTO) --dvi ../mac/mac.tex