Fred Drake  committed 3e1bf75

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

  • Participants
  • Parent commits fd54022
  • Branches 2.3

Comments (0)

Files changed (2)

File Doc/tools/mkinfo

+COMMONDIR="`dirname $DOCDIR`/commontex"
 run() {
     # show what we're doing, like make does:
 # 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\")" \

File Doc/tools/py2texi.el

 			  (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