--- texinfo-4.6/util/texi2dvi.orig	2003-06-11 00:50:03 +0400
+++ texinfo-4.6/util/texi2dvi	2003-10-27 16:25:14 +0300
@@ -92,7 +92,6 @@
 set_language=
 textra=         # Extra TeX commands to insert in the input file.
 textra_cmd=     # sed command to insert TEXTRA where appropriate
-tmpdir=${TMPDIR:-/tmp}/t2d$$  # avoid collisions on 8.3 filesystems.
 txincludes=     # TEXINPUTS extensions, with trailing colon
 txiprereq=19990129 # minimum texinfo.tex version to have macro expansion
 verbose=false   # echo for verbose mode
@@ -208,13 +207,12 @@
 esac
 
 # Prepare the temporary directory.  Remove it at exit, unless debugging.
+tmpdir=`mktemp -dt texi2dvi.XXXXXXXXXX` || exit 1
+
 if test -z "$debug"; then
-  trap "cd / && rm -rf $tmpdir" 0 1 2 15
+  trap "rm -rf -- $tmpdir" EXIT HUP INT TERM QUIT
 fi
 
-# Create the temporary directory with strict rights
-(umask 077 && mkdir $tmpdir) || exit 1
-
 # Prepare the tools we might need.  This may be extra work in some
 # cases, but improves the readibility of the script.
 utildir=$tmpdir/utils