Added 'inst' and 'dist' -- the two Distutils manuals.

diff --git a/Doc/Makefile b/Doc/Makefile
index 41f00bd2dc466c9ddd12e2373bf0dfda42ddcda0..89f8de840e3992111da4b60850749b2016e241b6 100644 (file)
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -11,6 +11,8 @@
 #   mac -- Macintosh Library Modules
 #   ref -- Python Reference Manual
 #   tut -- Python Tutorial
+#   inst -- Installing Python Modules
+#   dist -- Distributing Python Modules
 #
 # The latex sources for each of these documents are in subdirectories
 # with the three-letter designations above as the directory names.
@@ -64,7 +66,7 @@ RELEASE=1.6a2
 
 # These must be declared phony since there
 # are directories with matching names:
-.PHONY: api doc ext lib mac ref tut
+.PHONY: api doc ext lib mac ref tut inst dist
 .PHONY: html info longhtml
 
 
@@ -105,6 +107,12 @@ ref ref.ps:
 tut tut.ps:
        (cd paper-$(PAPER); $(MAKE) tut.ps)
 
+inst inst.ps:
+       (cd paper-$(PAPER); $(MAKE) inst.ps)
+
+dist dist.ps:
+       (cd paper-$(PAPER); $(MAKE) dist.ps)
+
 
 api.dvi:
        (cd paper-$(PAPER); $(MAKE) api.dvi)
@@ -127,6 +135,12 @@ ref.dvi:
 tut.dvi:
        (cd paper-$(PAPER); $(MAKE) tut.dvi)
 
+inst.dvi:
+       (cd paper-$(PAPER); $(MAKE) inst.dvi)
+
+dist.dvi:
+       (cd paper-$(PAPER); $(MAKE) dist.dvi)
+
 
 api.pdf:
        (cd paper-$(PAPER); $(MAKE) api.pdf)
@@ -149,6 +163,12 @@ ref.pdf:
 tut.pdf:
        (cd paper-$(PAPER); $(MAKE) tut.pdf)
 
+inst.pdf:
+       (cd paper-$(PAPER); $(MAKE) inst.pdf)
+
+dist.pdf:
+       (cd paper-$(PAPER); $(MAKE) dist.pdf)
+
 
 # The remaining part of the Makefile is concerned with various
 # conversions, as described above.  See also the README file.
@@ -196,6 +216,12 @@ htmlref:
 htmltut:
        (cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile tut)
 
+htmlinst:
+       (cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile inst)
+
+htmldist:
+       (cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile dist)
+
 longhtml:
        (cd longhtml; $(MAKE) PAPER=$(PAPER))
 

diff --git a/Doc/Makefile.deps b/Doc/Makefile.deps
index 2ffc948efcc703483461ddc8c88e7645b81180c7..b093c3e25fc47875d67a427b3d41867bbd17b967 100644 (file)
--- a/Doc/Makefile.deps
+++ b/Doc/Makefile.deps
@@ -244,3 +244,7 @@ MACFILES= $(HOWTOSTYLES) $(COMMONTEX) \
        ../mac/libmacic.tex \
        ../mac/libframework.tex \
        ../mac/libminiae.tex
+
+INSTFILES = $(HOWTOSTYLES) $(COMMONTEX) ../inst/inst.tex
+
+DISTFILES = $(HOWTOSTYLES) $(COMMONTEX) ../dist/dist.tex

diff --git a/Doc/README b/Doc/README
index 00211a63c0b1b48ef57c2866927ed4a3288c5c2f..47328bc28f8f74e80644aeb28c3b0e6544f67363 100644 (file)
--- a/Doc/README
+++ b/Doc/README
@@ -20,6 +20,8 @@ The following are the LaTeX source files:
        mac/*.tex       Macintosh Library Modules
        ref/*.tex       Python Reference Manual
        tut/*.tex       Python Tutorial
+        inst/*.tex      Installing Python Modules
+        dist/*.tex      Distributing Python Modules
 
 Most use the "manual" document class and "python" package, derived from 
 the old "myformat.sty" style file.  The Macintosh Library Modules

diff --git a/Doc/paper-letter/Makefile b/Doc/paper-letter/Makefile
index 50067c3d131e217da315ed8cc64cbf912d351fef..b81ee2e2b4dd1f5428f09ba5ecd210f314f41f0e 100644 (file)
--- a/Doc/paper-letter/Makefile
+++ b/Doc/paper-letter/Makefile
@@ -20,13 +20,13 @@ MKPDF=              TEXINPUTS=$(TEXINPUTS) $(TOOLSDIR)/mkdvi.sh --pdf
 
 # what's what
 MANDVIFILES=   api.dvi ext.dvi lib.dvi ref.dvi tut.dvi
-HOWTODVIFILES= doc.dvi mac.dvi
+HOWTODVIFILES= doc.dvi mac.dvi inst.dvi dist.dvi
 
 MANPDFFILES=   api.pdf ext.pdf lib.pdf ref.pdf tut.pdf
-HOWTOPDFFILES= doc.pdf mac.pdf
+HOWTOPDFFILES= doc.pdf mac.pdf inst.pdf dist.pdf
 
 MANPSFILES=    api.ps ext.ps lib.ps ref.ps tut.ps
-HOWTOPSFILES=  doc.ps mac.ps
+HOWTOPSFILES=  doc.ps mac.ps inst.ps dist.ps
 
 DVIFILES=      $(MANDVIFILES) $(HOWTODVIFILES)
 PDFFILES=      $(MANPDFFILES) $(HOWTOPDFFILES)
@@ -72,6 +72,13 @@ api.pdf: api.tex $(APIFILES)
 api.tex: ../api/api.tex ../api/refcounts.dat ../tools/anno-api.py
        $(PYTHON) ../tools/anno-api.py -o $@ ../api/api.tex
 
+# Distributing Python Modules
+dist.dvi: $(DISTFILES)
+       $(MKHOWTO) --dvi ../dist/dist.tex
+
+dist.pdf: $(DISTFILES)
+       $(MKHOWTO) --pdf ../dist/dist.tex
+
 # Documenting Python
 doc.dvi: $(DOCFILES)
        $(MKHOWTO) --dvi ../doc/doc.tex
@@ -86,6 +93,13 @@ ext.dvi: $(EXTFILES)
 ext.pdf: $(EXTFILES)
        $(MKPDF) ext
 
+# Installing Python Modules
+inst.dvi: $(INSTFILES)
+       $(MKHOWTO) --dvi ../inst/inst.tex
+
+inst.pdf: $(INSTFILES)
+       $(MKHOWTO) --pdf ../inst/inst.tex
+
 # Python Library Reference
 lib.dvi: $(LIBFILES)
        $(MKDVI) lib