Move content input files shared among the documents into a new directory
(commontex/), leaving only style support files in texinputs/. This makes
texinputs/ part of the formatting tools while commontex/ is strictly part
of the actual documentation.
diff --git a/Doc/Makefile b/Doc/Makefile
index 34bd632..2ea8180 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -71,6 +71,13 @@
PYTHON= python
DVIPS= dvips -N0 -t $(PAPER)
+PWD=$(shell pwd)
+
+# (The trailing colon in the value is needed; TeX places it's default
+# set of paths at the location of the empty string in the path list.)
+#
+TEXINPUTS=$(PWD)/commontex:
+
# This is ugly! The issue here is that there are two different levels
# in the directory tree at which we execute mkhowto, so we can't
# define it just once using a relative path (at least not with the
@@ -78,7 +85,7 @@
# $(shell) function here to work around that restriction by
# identifying mkhowto using an absolute path.
#
-MKHOWTO= $(PYTHON) $(shell pwd)/tools/mkhowto
+MKHOWTO= TEXINPUTS=$(TEXINPUTS) $(PYTHON) $(PWD)/tools/mkhowto
MKDVI= $(MKHOWTO) --paper=$(PAPER) --dvi
MKHTML= $(MKHOWTO) --html --about html/stdabout.dat \
diff --git a/Doc/Makefile.deps b/Doc/Makefile.deps
index faa2129..b7724da 100644
--- a/Doc/Makefile.deps
+++ b/Doc/Makefile.deps
@@ -5,9 +5,9 @@
INDEXSTYLES=texinputs/python.ist
-COMMONTEX= texinputs/copyright.tex \
- texinputs/license.tex \
- texinputs/boilerplate.tex
+COMMONTEX=commontex/copyright.tex \
+ commontex/license.tex \
+ commontex/boilerplate.tex
MANSTYLES= texinputs/fncychap.sty \
texinputs/manual.cls \
@@ -29,8 +29,8 @@
api/refcounting.tex \
api/utilities.tex \
api/veryhigh.tex \
- texinputs/typestruct.h \
- texinputs/reportingbugs.tex
+ commontex/typestruct.h \
+ commontex/reportingbugs.tex
# These files are generated from those listed above, and are used to
# generate the typeset versions of the manuals. The list is defined
@@ -47,10 +47,10 @@
paper-$(PAPER)/refcounting.tex \
paper-$(PAPER)/utilities.tex \
paper-$(PAPER)/veryhigh.tex \
- texinputs/reportingbugs.tex
+ commontex/reportingbugs.tex
DOCFILES= $(HOWTOSTYLES) \
- texinputs/boilerplate.tex \
+ commontex/boilerplate.tex \
texinputs/ltxmarkup.sty \
doc/doc.tex
@@ -65,8 +65,8 @@
ext/noddy3.c \
ext/noddy4.c \
ext/run-func.c \
- texinputs/typestruct.h \
- texinputs/reportingbugs.tex
+ commontex/typestruct.h \
+ commontex/reportingbugs.tex
TUTFILES= tut/tut.tex tut/glossary.tex $(MANSTYLES) $(COMMONTEX)
@@ -84,7 +84,7 @@
# LaTeX source files for the Python Library Reference
LIBFILES= $(MANSTYLES) $(INDEXSTYLES) $(COMMONTEX) \
- texinputs/reportingbugs.tex \
+ commontex/reportingbugs.tex \
lib/lib.tex \
lib/asttable.tex \
lib/compiler.tex \
diff --git a/Doc/texinputs/boilerplate.tex b/Doc/commontex/boilerplate.tex
similarity index 100%
rename from Doc/texinputs/boilerplate.tex
rename to Doc/commontex/boilerplate.tex
diff --git a/Doc/texinputs/copyright.tex b/Doc/commontex/copyright.tex
similarity index 100%
rename from Doc/texinputs/copyright.tex
rename to Doc/commontex/copyright.tex
diff --git a/Doc/texinputs/license.tex b/Doc/commontex/license.tex
similarity index 99%
rename from Doc/texinputs/license.tex
rename to Doc/commontex/license.tex
index 5e325a9..263d4f9 100644
--- a/Doc/texinputs/license.tex
+++ b/Doc/commontex/license.tex
@@ -42,6 +42,7 @@
\linev{2.2.3}{2.2.2}{2002-2003}{PSF}{yes}
\linev{2.3}{2.2.2}{2002-2003}{PSF}{yes}
\linev{2.3.1}{2.3}{2002-2003}{PSF}{yes}
+ \linev{2.3.2}{2.3.1}{2003}{PSF}{yes}
\end{tablev}
\note{GPL-compatible doesn't mean that we're distributing
diff --git a/Doc/texinputs/reportingbugs.tex b/Doc/commontex/reportingbugs.tex
similarity index 100%
rename from Doc/texinputs/reportingbugs.tex
rename to Doc/commontex/reportingbugs.tex
diff --git a/Doc/texinputs/typestruct.h b/Doc/commontex/typestruct.h
similarity index 100%
rename from Doc/texinputs/typestruct.h
rename to Doc/commontex/typestruct.h