[Python-checkins] python/dist/src/Doc/tools mkinfo, 1.5, 1.5.16.1 py2texi.el, 1.8, 1.8.8.1

[fdrake at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Doc/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv21877

Modified Files:
      Tag: release23-maint
	mkinfo py2texi.el 
Log Message:
Backport changes from trunk needed to make the GNU info format build.

Index: mkinfo
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/mkinfo,v
retrieving revision 1.5
retrieving revision 1.5.16.1
diff -C2 -d -r1.5 -r1.5.16.1
*** mkinfo	13 Nov 2002 19:31:04 -0000	1.5
--- mkinfo	29 Sep 2003 17:22:33 -0000	1.5.16.1
***************
*** 39,42 ****
--- 39,44 ----
  cd $WORKDIR
  
+ COMMONDIR="`dirname $DOCDIR`/commontex"
+ 
  
  run() {
***************
*** 50,54 ****
  
  run $EMACS -batch -q --no-site-file -l $TOOLSDIR/py2texi.el \
!     --eval "(setq py2texi-dirs '(\"./\" \"../texinputs/\" \"$DOCDIR\"))" \
      --eval "(setq py2texi-texi-file-name \"$TEXINAME\")" \
      --eval "(setq py2texi-info-file-name \"$INFONAME\")" \
--- 52,56 ----
  
  run $EMACS -batch -q --no-site-file -l $TOOLSDIR/py2texi.el \
!     --eval "(setq py2texi-dirs '(\"$DOCDIR\" \"$COMMONDIR\" \"../texinputs\"))" \
      --eval "(setq py2texi-texi-file-name \"$TEXINAME\")" \
      --eval "(setq py2texi-info-file-name \"$INFONAME\")" \

Index: py2texi.el
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/py2texi.el,v
retrieving revision 1.8
retrieving revision 1.8.8.1
diff -C2 -d -r1.8 -r1.8.8.1
*** py2texi.el	16 Jul 2003 03:44:48 -0000	1.8
--- py2texi.el	29 Sep 2003 17:22:33 -0000	1.8.8.1
***************
*** 570,576 ****
        (setq dirs py2texi-dirs)
        (while (and (not includefile) dirs)
! 	(setq includefile (concat path (car dirs) filename))
  	(unless (file-exists-p includefile)
! 	  (setq includefile nil)
  	  (setq dirs (cdr dirs))))
        (if includefile
--- 570,580 ----
        (setq dirs py2texi-dirs)
        (while (and (not includefile) dirs)
! 	(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 dirs (cdr dirs))))
        (if includefile