Update of /cvsroot/python/python/dist/src/Doc In directory sc8-pr-cvs1:/tmp/cvs-serv9134 Modified Files: Tag: release23-maint Makefile Makefile.deps Log Message: 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. Index: Makefile =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/Makefile,v retrieving revision 1.261.4.3 retrieving revision 1.261.4.4 diff -C2 -d -r1.261.4.3 -r1.261.4.4 *** Makefile 27 Sep 2003 06:01:35 -0000 1.261.4.3 --- Makefile 27 Sep 2003 07:14:31 -0000 1.261.4.4 *************** *** 65,68 **** --- 65,70 ---- TOOLSDIR= tools + PWD=$(shell pwd) + # This is the *documentation* release, and is used to construct the file # names of the downloadable tarballs. *************** *** 72,75 **** --- 74,82 ---- DVIPS= dvips -N0 -t $(PAPER) + # (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 *************** *** 79,83 **** # identifying mkhowto using an absolute path. # ! MKHOWTO= $(PYTHON) $(shell pwd)/tools/mkhowto MKDVI= $(MKHOWTO) --paper=$(PAPER) --dvi --- 86,90 ---- # identifying mkhowto using an absolute path. # ! MKHOWTO= TEXINPUTS=$(TEXINPUTS) $(PYTHON) $(PWD)/tools/mkhowto MKDVI= $(MKHOWTO) --paper=$(PAPER) --dvi Index: Makefile.deps =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/Makefile.deps,v retrieving revision 1.110.8.1 retrieving revision 1.110.8.2 diff -C2 -d -r1.110.8.1 -r1.110.8.2 *** Makefile.deps 6 Sep 2003 06:42:42 -0000 1.110.8.1 --- Makefile.deps 27 Sep 2003 07:14:31 -0000 1.110.8.2 *************** *** 6,12 **** INDEXSTYLES=texinputs/python.ist ! COMMONTEX= texinputs/copyright.tex \ ! texinputs/license.tex \ ! texinputs/boilerplate.tex MANSTYLES= texinputs/fncychap.sty \ --- 6,12 ---- INDEXSTYLES=texinputs/python.ist ! COMMONTEX=commontex/copyright.tex \ ! commontex/license.tex \ ! commontex/boilerplate.tex MANSTYLES= texinputs/fncychap.sty \ *************** *** 30,35 **** api/utilities.tex \ api/veryhigh.tex \ ! texinputs/typestruct.h \ ! texinputs/reportingbugs.tex # These files are generated from those listed above, and are used to --- 30,35 ---- api/utilities.tex \ api/veryhigh.tex \ ! commontex/typestruct.h \ ! commontex/reportingbugs.tex # These files are generated from those listed above, and are used to *************** *** 48,55 **** paper-$(PAPER)/utilities.tex \ paper-$(PAPER)/veryhigh.tex \ ! texinputs/reportingbugs.tex DOCFILES= $(HOWTOSTYLES) \ ! texinputs/boilerplate.tex \ texinputs/ltxmarkup.sty \ doc/doc.tex --- 48,55 ---- paper-$(PAPER)/utilities.tex \ paper-$(PAPER)/veryhigh.tex \ ! commontex/reportingbugs.tex DOCFILES= $(HOWTOSTYLES) \ ! commontex/boilerplate.tex \ texinputs/ltxmarkup.sty \ doc/doc.tex *************** *** 66,71 **** ext/noddy4.c \ ext/run-func.c \ ! texinputs/typestruct.h \ ! texinputs/reportingbugs.tex TUTFILES= tut/tut.tex $(MANSTYLES) $(COMMONTEX) --- 66,71 ---- ext/noddy4.c \ ext/run-func.c \ ! commontex/typestruct.h \ ! commontex/reportingbugs.tex TUTFILES= tut/tut.tex $(MANSTYLES) $(COMMONTEX) *************** *** 85,89 **** # LaTeX source files for the Python Library Reference LIBFILES= $(MANSTYLES) $(INDEXSTYLES) $(COMMONTEX) \ ! texinputs/reportingbugs.tex \ lib/lib.tex \ lib/asttable.tex \ --- 85,89 ---- # LaTeX source files for the Python Library Reference LIBFILES= $(MANSTYLES) $(INDEXSTYLES) $(COMMONTEX) \ ! commontex/reportingbugs.tex \ lib/lib.tex \ lib/asttable.tex \