From: Fred Drake <fdrake@acm.org>
Date: Sat, 27 Sep 2003 05:52:16 +0000 (+0000)
Subject: Fix the most recent change to the invocation of the mkhowto script so
X-Git-Tag: v2.4a1~1511
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e395e2278ca5f3a0eae56108a58ddf72f5360058;p=python

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.
---

diff --git a/Doc/Makefile b/Doc/Makefile
index 3fae30b9d6..34bd63209b 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 \