From 6ec730e4f73f455ebb777db32928321756574dd7 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Mon, 29 Sep 2003 17:22:33 +0000
Subject: Backport changes from trunk needed to make the GNU info format build.

---
 Doc/tools/mkinfo     | 4 +++-
 Doc/tools/py2texi.el | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Doc/tools/mkinfo b/Doc/tools/mkinfo
index d952730..be75168 100755
--- a/Doc/tools/mkinfo
+++ b/Doc/tools/mkinfo
@@ -38,6 +38,8 @@ cd $DOCDIR
 DOCDIR=`pwd`
 cd $WORKDIR
 
+COMMONDIR="`dirname $DOCDIR`/commontex"
+
 
 run() {
     # show what we're doing, like make does:
@@ -49,7 +51,7 @@ run() {
 # generate the Texinfo file:
 
 run $EMACS -batch -q --no-site-file -l $TOOLSDIR/py2texi.el \
-    --eval "(setq py2texi-dirs '(\"./\" \"../texinputs/\" \"$DOCDIR\"))" \
+    --eval "(setq py2texi-dirs '(\"$DOCDIR\" \"$COMMONDIR\" \"../texinputs\"))" \
     --eval "(setq py2texi-texi-file-name \"$TEXINAME\")" \
     --eval "(setq py2texi-info-file-name \"$INFONAME\")" \
     --eval "(py2texi \"$DOCDIR/$DOCFILE\")" \
diff --git a/Doc/tools/py2texi.el b/Doc/tools/py2texi.el
index b117cad..b7155ac 100644
--- a/Doc/tools/py2texi.el
+++ b/Doc/tools/py2texi.el
@@ -569,9 +569,13 @@ Do not include .ind files."
 			  (string-match "\\.ind\\.tex$" filename)))
       (setq dirs py2texi-dirs)
       (while (and (not includefile) dirs)
-	(setq includefile (concat path (car dirs) filename))
+	(setq includefile
+              (concat (file-name-as-directory (car dirs)) filename))
+        (if (not (file-name-absolute-p includefile))
+            (setq includefile
+                  (concat (file-name-as-directory path) includefile)))
 	(unless (file-exists-p includefile)
-	  (setq includefile nil)
+          (setq includefile nil)
 	  (setq dirs (cdr dirs))))
       (if includefile
 	  (save-restriction
-- 
cgit v0.12