summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2003-09-27 05:52:16 (GMT)
committerFred Drake <fdrake@acm.org>2003-09-27 05:52:16 (GMT)
commite395e2278ca5f3a0eae56108a58ddf72f5360058 (patch)
treef6b31f38a08bc8b344348caf7577b213294549c2 /Doc
parent5a25aa6c4a2b8a6ab26966a55bfb877914083c3c (diff)
downloadcpython-e395e2278ca5f3a0eae56108a58ddf72f5360058.zip
cpython-e395e2278ca5f3a0eae56108a58ddf72f5360058.tar.gz
cpython-e395e2278ca5f3a0eae56108a58ddf72f5360058.tar.bz2
Fix the most recent change to the invocation of the mkhowto script so
that it works for all targets. 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.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/Makefile9
1 files changed, 8 insertions, 1 deletions
diff --git a/Doc/Makefile b/Doc/Makefile
index 3fae30b..34bd632 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -71,7 +71,14 @@ RELEASE=2.4a0
PYTHON= python
DVIPS= dvips -N0 -t $(PAPER)
-MKHOWTO= $(PYTHON) ../tools/mkhowto
+# 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 \