Fred Drake avatar Fred Drake committed 032b925

- bump version info
- backport changes from trunk revisions 1.265, 1.266 (separate
definition of the mkhowto script location from the invocations of
the script)

Comments (0)

Files changed (1)

 # This is the *documentation* release, and is used to construct the file
 # names of the downloadable tarballs.
 PYTHON=	   python
 DVIPS=	   dvips -N0 -t $(PAPER)
-MKDVI=	   $(PYTHON) ../tools/mkhowto --paper=$(PAPER) --dvi
-MKHTML=	   $(PYTHON) tools/mkhowto --html --about html/stdabout.dat \
+# 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
+# current implementation and Makefile structure).  We use the GNUish
+# $(shell) function here to work around that restriction by
+# identifying mkhowto using an absolute path.
+MKHOWTO=   $(PYTHON) $(shell pwd)/tools/mkhowto
+MKDVI=	   $(MKHOWTO) --paper=$(PAPER) --dvi
+MKHTML=	   $(MKHOWTO) --html --about html/stdabout.dat \
 		--iconserver ../icons --favicon ../icons/pyfav.gif \
 		--address $(PYTHONDOCS) --up-link ../index.html \
 		--up-title "Python Documentation Index" \
 		--global-module-index "../modindex.html" --dvips-safe
-MKISILOHTML=$(PYTHON) tools/mkhowto --html --about html/stdabout.dat \
+MKISILOHTML=$(MKHOWTO) --html --about html/stdabout.dat \
 		--iconserver ../icons \
 		--l2h-init perl/isilo.perl --numeric --split 1 \
 MKISILO=   iSilo386 -U -y -rCR -d0
-MKPDF=	   $(PYTHON) ../tools/mkhowto --paper=$(PAPER) --pdf
-MKPS=	   $(PYTHON) ../tools/mkhowto --paper=$(PAPER) --ps
+MKPDF=	   $(MKHOWTO) --paper=$(PAPER) --pdf
+MKPS=	   $(MKHOWTO) --paper=$(PAPER) --ps
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.