Don't run tools/toc2bkm.py unless we're building PDF.

Change the way TEXINPUTS gets defined to ensure that the directory containing
the main document file comes before any other dir, to allow documents to have
files that "override" like-named files elsewhere on the search path.  Guido
discovered we needed this.
This commit is contained in:
Fred Drake 1998-05-14 20:03:14 +00:00
parent 5c07d9b028
commit f4fc476885
1 changed files with 11 additions and 6 deletions

View File

@ -15,11 +15,6 @@ DISCARD_TEMPS=true
L2H_INIT_FILE=$TOPDIR/perl/l2hinit.perl L2H_INIT_FILE=$TOPDIR/perl/l2hinit.perl
# This is needed to support kpathsea based TeX installations. Others are
# not supported. ;-)
TEXINPUTS=$TOPDIR/texinputs:$TEXINPUTS
export TEXINPUTS
LOGFILE=/usr/tmp/mkhowto-$LOGNAME-$$.how LOGFILE=/usr/tmp/mkhowto-$LOGNAME-$$.how
LOGGING='' LOGGING=''
@ -107,7 +102,7 @@ use_latex() {
$MYDIR/fix_hack $MYFILE.idx || exit $? $MYDIR/fix_hack $MYFILE.idx || exit $?
makeindex -s $TOPDIR/texinputs/myindex.ist $MYFILE.idx || exit $? makeindex -s $TOPDIR/texinputs/myindex.ist $MYFILE.idx || exit $?
fi fi
if [ -f $MYFILE.toc ] ; then if [ -f $MYFILE.toc -a $MYLATEX = pdflatex ] ; then
$MYDIR/toc2bkm.py -c section $MYFILE $MYDIR/toc2bkm.py -c section $MYFILE
fi fi
$MYLATEX $MYFILE || exit $? $MYLATEX $MYFILE || exit $?
@ -222,8 +217,18 @@ if [ "$QUIET" ] ; then
exec >/dev/null exec >/dev/null
fi fi
COMMONTEXINPUTS=$TOPDIR/texinputs:$TEXINPUTS
for FILE in $@ ; do for FILE in $@ ; do
FILE=`basename ${FILE%.tex}` FILE=`basename ${FILE%.tex}`
#
# Put the directory the .tex file is in is also the first directory in
# TEXINPUTS, to allow files there to override files in the common area.
#
FILEDIR=`dirname $FILE`
TEXINPUTS=$FILEDIR:$COMMONTEXINPUTS
export TEXINPUTS
#
if [ "$BUILD_DVI" -o "$BUILD_PS" ] ; then if [ "$BUILD_DVI" -o "$BUILD_PS" ] ; then
build_dvi $FILE 2>&1 | tee -a $LOGFILE build_dvi $FILE 2>&1 | tee -a $LOGFILE
fi fi