diff options
| author | Fred Drake <fdrake@acm.org> | 2003-09-29 17:22:33 (GMT) |
|---|---|---|
| committer | Fred Drake <fdrake@acm.org> | 2003-09-29 17:22:33 (GMT) |
| commit | 6ec730e4f73f455ebb777db32928321756574dd7 (patch) | |
| tree | c4b2466b7e24a78b7b5cc582800bb0aaf6f4c27f | |
| parent | 75dd6e4798b322eafc2227ee5e6f7d6cebafea86 (diff) | |
| download | cpython-6ec730e4f73f455ebb777db32928321756574dd7.zip cpython-6ec730e4f73f455ebb777db32928321756574dd7.tar.gz cpython-6ec730e4f73f455ebb777db32928321756574dd7.tar.bz2 | |
Backport changes from trunk needed to make the GNU info format build.
| -rwxr-xr-x | Doc/tools/mkinfo | 4 | ||||
| -rw-r--r-- | 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 |