Backport changes from trunk needed to make the GNU info format build.

diff --git a/Doc/tools/mkinfo b/Doc/tools/mkinfo
index d9527301ae2af039dde2ba0e62dd3f5109573d1a..be75168fd2499ea8c949c330e3849cc56e4b825d 100755 (executable)
--- 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 b117cad174416453566abce784400dd911220a70..b7155acca814c2616591fb60e5b762daae219299 100644 (file)
--- 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