18 files changed, 90 insertions, 48 deletions
diff --git a/Master/bin/alpha-linux/mktexlsr b/Master/bin/alpha-linux/mktexlsr
index d0b77417835..3161a5317ec 100755
--- a/Master/bin/alpha-linux/mktexlsr
+++ b/Master/bin/alpha-linux/mktexlsr
@@ -10,7 +10,7 @@
 # Originally written as `texhash' by Thomas Esser, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr 36626 2015-03-25 22:51:45Z karl $'
+version='$Id: mktexlsr 36855 2015-04-14 12:15:08Z preining $'
 progname=`echo $0 | sed 's%.*/%%'`
 
 usage="Usage: $progname [OPTION]... [DIR]...
@@ -73,7 +73,7 @@ if tty -s; then verbose=true; else verbose=false; fi
 dry_run=false
 trees=
 
-treefile=`mktemp --tmpdir mktexlsrtrees.XXXXXXXXXX` || exit 1
+treefile="${TMPDIR-/tmp}/mktexlsrtrees$$.tmp"
 trap 'cd /; rm -f $treefile; test -z "$db_dir_tmp" || rm -rf "$db_dir_tmp"; 
       exit' 0 1 2 3 7 13 15
 
diff --git a/Master/bin/amd64-freebsd/mktexlsr b/Master/bin/amd64-freebsd/mktexlsr
index d0b77417835..3161a5317ec 100755
--- a/Master/bin/amd64-freebsd/mktexlsr
+++ b/Master/bin/amd64-freebsd/mktexlsr
@@ -10,7 +10,7 @@
 # Originally written as `texhash' by Thomas Esser, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr 36626 2015-03-25 22:51:45Z karl $'
+version='$Id: mktexlsr 36855 2015-04-14 12:15:08Z preining $'
 progname=`echo $0 | sed 's%.*/%%'`
 
 usage="Usage: $progname [OPTION]... [DIR]...
@@ -73,7 +73,7 @@ if tty -s; then verbose=true; else verbose=false; fi
 dry_run=false
 trees=
 
-treefile=`mktemp --tmpdir mktexlsrtrees.XXXXXXXXXX` || exit 1
+treefile="${TMPDIR-/tmp}/mktexlsrtrees$$.tmp"
 trap 'cd /; rm -f $treefile; test -z "$db_dir_tmp" || rm -rf "$db_dir_tmp"; 
       exit' 0 1 2 3 7 13 15
 
diff --git a/Master/bin/amd64-netbsd/mktexlsr b/Master/bin/amd64-netbsd/mktexlsr
index abb5d05b349..3161a5317ec 100755
--- a/Master/bin/amd64-netbsd/mktexlsr
+++ b/Master/bin/amd64-netbsd/mktexlsr
@@ -7,12 +7,12 @@
 # Suitable for calling from cron, as in:
 # 0 * * * * cd /your/texmf/root && /usr/local/texlive/bin/mktexlsr
 # 
-# Originally written as `texhash' by Thomas Esser
-# <te@dbs.uni-hannover.de>, Okt., 1994.
+# Originally written as `texhash' by Thomas Esser, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr 31723 2013-09-21 22:43:41Z karl $'
+version='$Id: mktexlsr 36855 2015-04-14 12:15:08Z preining $'
 progname=`echo $0 | sed 's%.*/%%'`
+
 usage="Usage: $progname [OPTION]... [DIR]...
 
 Rebuild ls-R filename databases used by TeX.  If one or more arguments
@@ -33,9 +33,16 @@ If standard input is a terminal, --verbose is on by default.
 For more information, see the \`Filename database' section of
 Kpathsea manual available at http://tug.org/kpathsea.
 
-Report bugs to tex-k@tug.org.
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
 "
 
+# The simple PATH-prepending approach we take in other scripts doesn't
+# handle DOS/Windows, but we don't use the shell scripts on Windows
+# anyway, and does anyone want current TL on DOS or DJGPP?  Maybe they
+# can maintain their own changes if so.  Leaving this code though, since
+# it's always been here ...
+
 # MS-DOS and MS-Windows define $COMSPEC or $ComSpec and use `;' to separate
 # directories in path lists whereas Unix uses `:'.  Make an exception for
 # Cygwin, which pretends to be UNIX.
diff --git a/Master/bin/armel-linux/mktexlsr b/Master/bin/armel-linux/mktexlsr
index d0b77417835..3161a5317ec 100755
--- a/Master/bin/armel-linux/mktexlsr
+++ b/Master/bin/armel-linux/mktexlsr
@@ -10,7 +10,7 @@
 # Originally written as `texhash' by Thomas Esser, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr 36626 2015-03-25 22:51:45Z karl $'
+version='$Id: mktexlsr 36855 2015-04-14 12:15:08Z preining $'
 progname=`echo $0 | sed 's%.*/%%'`
 
 usage="Usage: $progname [OPTION]... [DIR]...
@@ -73,7 +73,7 @@ if tty -s; then verbose=true; else verbose=false; fi
 dry_run=false
 trees=
 
-treefile=`mktemp --tmpdir mktexlsrtrees.XXXXXXXXXX` || exit 1
+treefile="${TMPDIR-/tmp}/mktexlsrtrees$$.tmp"
 trap 'cd /; rm -f $treefile; test -z "$db_dir_tmp" || rm -rf "$db_dir_tmp"; 
       exit' 0 1 2 3 7 13 15
 
diff --git a/Master/bin/armhf-linux/mktexlsr b/Master/bin/armhf-linux/mktexlsr
index abb5d05b349..3161a5317ec 100755
--- a/Master/bin/armhf-linux/mktexlsr
+++ b/Master/bin/armhf-linux/mktexlsr
@@ -7,12 +7,12 @@
 # Suitable for calling from cron, as in:
 # 0 * * * * cd /your/texmf/root && /usr/local/texlive/bin/mktexlsr
 # 
-# Originally written as `texhash' by Thomas Esser
-# <te@dbs.uni-hannover.de>, Okt., 1994.
+# Originally written as `texhash' by Thomas Esser, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr 31723 2013-09-21 22:43:41Z karl $'
+version='$Id: mktexlsr 36855 2015-04-14 12:15:08Z preining $'
 progname=`echo $0 | sed 's%.*/%%'`
+
 usage="Usage: $progname [OPTION]... [DIR]...
 
 Rebuild ls-R filename databases used by TeX.  If one or more arguments
@@ -33,9 +33,16 @@ If standard input is a terminal, --verbose is on by default.
 For more information, see the \`Filename database' section of
 Kpathsea manual available at http://tug.org/kpathsea.
 
-Report bugs to tex-k@tug.org.
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
 "
 
+# The simple PATH-prepending approach we take in other scripts doesn't
+# handle DOS/Windows, but we don't use the shell scripts on Windows
+# anyway, and does anyone want current TL on DOS or DJGPP?  Maybe they
+# can maintain their own changes if so.  Leaving this code though, since
+# it's always been here ...
+
 # MS-DOS and MS-Windows define $COMSPEC or $ComSpec and use `;' to separate
 # directories in path lists whereas Unix uses `:'.  Make an exception for
 # Cygwin, which pretends to be UNIX.
diff --git a/Master/bin/i386-cygwin/mktexlsr b/Master/bin/i386-cygwin/mktexlsr
index d0b77417835..3161a5317ec 100755
--- a/Master/bin/i386-cygwin/mktexlsr
+++ b/Master/bin/i386-cygwin/mktexlsr
@@ -10,7 +10,7 @@
 # Originally written as `texhash' by Thomas Esser, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr 36626 2015-03-25 22:51:45Z karl $'
+version='$Id: mktexlsr 36855 2015-04-14 12:15:08Z preining $'
 progname=`echo $0 | sed 's%.*/%%'`
 
 usage="Usage: $progname [OPTION]... [DIR]...
@@ -73,7 +73,7 @@ if tty -s; then verbose=true; else verbose=false; fi
 dry_run=false
 trees=
 
-treefile=`mktemp --tmpdir mktexlsrtrees.XXXXXXXXXX` || exit 1
+treefile="${TMPDIR-/tmp}/mktexlsrtrees$$.tmp"
 trap 'cd /; rm -f $treefile; test -z "$db_dir_tmp" || rm -rf "$db_dir_tmp"; 
       exit' 0 1 2 3 7 13 15
 
diff --git a/Master/bin/i386-freebsd/mktexlsr b/Master/bin/i386-freebsd/mktexlsr
index d0b77417835..3161a5317ec 100755
--- a/Master/bin/i386-freebsd/mktexlsr
+++ b/Master/bin/i386-freebsd/mktexlsr
@@ -10,7 +10,7 @@
 # Originally written as `texhash' by Thomas Esser, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr 36626 2015-03-25 22:51:45Z karl $'
+version='$Id: mktexlsr 36855 2015-04-14 12:15:08Z preining $'
 progname=`echo $0 | sed 's%.*/%%'`
 
 usage="Usage: $progname [OPTION]... [DIR]...
@@ -73,7 +73,7 @@ if tty -s; then verbose=true; else verbose=false; fi
 dry_run=false
 trees=
 
-treefile=`mktemp --tmpdir mktexlsrtrees.XXXXXXXXXX` || exit 1
+treefile="${TMPDIR-/tmp}/mktexlsrtrees$$.tmp"
 trap 'cd /; rm -f $treefile; test -z "$db_dir_tmp" || rm -rf "$db_dir_tmp"; 
       exit' 0 1 2 3 7 13 15
 
diff --git a/Master/bin/i386-linux/mktexlsr b/Master/bin/i386-linux/mktexlsr
index d0b77417835..3161a5317ec 100755
--- a/Master/bin/i386-linux/mktexlsr
+++ b/Master/bin/i386-linux/mktexlsr
@@ -10,7 +10,7 @@
 # Originally written as `texhash' by Thomas Esser, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr 36626 2015-03-25 22:51:45Z karl $'
+version='$Id: mktexlsr 36855 2015-04-14 12:15:08Z preining $'
 progname=`echo $0 | sed 's%.*/%%'`
 
 usage="Usage: $progname [OPTION]... [DIR]...
@@ -73,7 +73,7 @@ if tty -s; then verbose=true; else verbose=false; fi
 dry_run=false
 trees=
 
-treefile=`mktemp --tmpdir mktexlsrtrees.XXXXXXXXXX` || exit 1
+treefile="${TMPDIR-/tmp}/mktexlsrtrees$$.tmp"
 trap 'cd /; rm -f $treefile; test -z "$db_dir_tmp" || rm -rf "$db_dir_tmp"; 
       exit' 0 1 2 3 7 13 15
 
diff --git a/Master/bin/i386-netbsd/mktexlsr b/Master/bin/i386-netbsd/mktexlsr
index abb5d05b349..3161a5317ec 100755
--- a/Master/bin/i386-netbsd/mktexlsr
+++ b/Master/bin/i386-netbsd/mktexlsr
@@ -7,12 +7,12 @@
 # Suitable for calling from cron, as in:
 # 0 * * * * cd /your/texmf/root && /usr/local/texlive/bin/mktexlsr
 # 
-# Originally written as `texhash' by Thomas Esser
-# <te@dbs.uni-hannover.de>, Okt., 1994.
+# Originally written as `texhash' by Thomas Esser, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr 31723 2013-09-21 22:43:41Z karl $'
+version='$Id: mktexlsr 36855 2015-04-14 12:15:08Z preining $'
 progname=`echo $0 | sed 's%.*/%%'`
+
 usage="Usage: $progname [OPTION]... [DIR]...
 
 Rebuild ls-R filename databases used by TeX.  If one or more arguments
@@ -33,9 +33,16 @@ If standard input is a terminal, --verbose is on by default.
 For more information, see the \`Filename database' section of
 Kpathsea manual available at http://tug.org/kpathsea.
 
-Report bugs to tex-k@tug.org.
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
 "
 
+# The simple PATH-prepending approach we take in other scripts doesn't
+# handle DOS/Windows, but we don't use the shell scripts on Windows
+# anyway, and does anyone want current TL on DOS or DJGPP?  Maybe they
+# can maintain their own changes if so.  Leaving this code though, since
+# it's always been here ...
+
 # MS-DOS and MS-Windows define $COMSPEC or $ComSpec and use `;' to separate
 # directories in path lists whereas Unix uses `:'.  Make an exception for
 # Cygwin, which pretends to be UNIX.
diff --git a/Master/bin/i386-solaris/mktexlsr b/Master/bin/i386-solaris/mktexlsr
index abb5d05b349..3161a5317ec 100755
--- a/Master/bin/i386-solaris/mktexlsr
+++ b/Master/bin/i386-solaris/mktexlsr
@@ -7,12 +7,12 @@
 # Suitable for calling from cron, as in:
 # 0 * * * * cd /your/texmf/root && /usr/local/texlive/bin/mktexlsr
 # 
-# Originally written as `texhash' by Thomas Esser
-# <te@dbs.uni-hannover.de>, Okt., 1994.
+# Originally written as `texhash' by Thomas Esser, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr 31723 2013-09-21 22:43:41Z karl $'
+version='$Id: mktexlsr 36855 2015-04-14 12:15:08Z preining $'
 progname=`echo $0 | sed 's%.*/%%'`
+
 usage="Usage: $progname [OPTION]... [DIR]...
 
 Rebuild ls-R filename databases used by TeX.  If one or more arguments
@@ -33,9 +33,16 @@ If standard input is a terminal, --verbose is on by default.
 For more information, see the \`Filename database' section of
 Kpathsea manual available at http://tug.org/kpathsea.
 
-Report bugs to tex-k@tug.org.
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
 "
 
+# The simple PATH-prepending approach we take in other scripts doesn't
+# handle DOS/Windows, but we don't use the shell scripts on Windows
+# anyway, and does anyone want current TL on DOS or DJGPP?  Maybe they
+# can maintain their own changes if so.  Leaving this code though, since
+# it's always been here ...
+
 # MS-DOS and MS-Windows define $COMSPEC or $ComSpec and use `;' to separate
 # directories in path lists whereas Unix uses `:'.  Make an exception for
 # Cygwin, which pretends to be UNIX.
diff --git a/Master/bin/mipsel-linux/mktexlsr b/Master/bin/mipsel-linux/mktexlsr
index d0b77417835..3161a5317ec 100755
--- a/Master/bin/mipsel-linux/mktexlsr
+++ b/Master/bin/mipsel-linux/mktexlsr
@@ -10,7 +10,7 @@
 # Originally written as `texhash' by Thomas Esser, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr 36626 2015-03-25 22:51:45Z karl $'
+version='$Id: mktexlsr 36855 2015-04-14 12:15:08Z preining $'
 progname=`echo $0 | sed 's%.*/%%'`
 
 usage="Usage: $progname [OPTION]... [DIR]...
@@ -73,7 +73,7 @@ if tty -s; then verbose=true; else verbose=false; fi
 dry_run=false
 trees=
 
-treefile=`mktemp --tmpdir mktexlsrtrees.XXXXXXXXXX` || exit 1
+treefile="${TMPDIR-/tmp}/mktexlsrtrees$$.tmp"
 trap 'cd /; rm -f $treefile; test -z "$db_dir_tmp" || rm -rf "$db_dir_tmp"; 
       exit' 0 1 2 3 7 13 15
 
diff --git a/Master/bin/powerpc-linux/mktexlsr b/Master/bin/powerpc-linux/mktexlsr
index abb5d05b349..3161a5317ec 100755
--- a/Master/bin/powerpc-linux/mktexlsr
+++ b/Master/bin/powerpc-linux/mktexlsr
@@ -7,12 +7,12 @@
 # Suitable for calling from cron, as in:
 # 0 * * * * cd /your/texmf/root && /usr/local/texlive/bin/mktexlsr
 # 
-# Originally written as `texhash' by Thomas Esser
-# <te@dbs.uni-hannover.de>, Okt., 1994.
+# Originally written as `texhash' by Thomas Esser, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr 31723 2013-09-21 22:43:41Z karl $'
+version='$Id: mktexlsr 36855 2015-04-14 12:15:08Z preining $'
 progname=`echo $0 | sed 's%.*/%%'`
+
 usage="Usage: $progname [OPTION]... [DIR]...
 
 Rebuild ls-R filename databases used by TeX.  If one or more arguments
@@ -33,9 +33,16 @@ If standard input is a terminal, --verbose is on by default.
 For more information, see the \`Filename database' section of
 Kpathsea manual available at http://tug.org/kpathsea.
 
-Report bugs to tex-k@tug.org.
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
 "
 
+# The simple PATH-prepending approach we take in other scripts doesn't
+# handle DOS/Windows, but we don't use the shell scripts on Windows
+# anyway, and does anyone want current TL on DOS or DJGPP?  Maybe they
+# can maintain their own changes if so.  Leaving this code though, since
+# it's always been here ...
+
 # MS-DOS and MS-Windows define $COMSPEC or $ComSpec and use `;' to separate
 # directories in path lists whereas Unix uses `:'.  Make an exception for
 # Cygwin, which pretends to be UNIX.
diff --git a/Master/bin/sparc-solaris/mktexlsr b/Master/bin/sparc-solaris/mktexlsr
index d0b77417835..3161a5317ec 100755
--- a/Master/bin/sparc-solaris/mktexlsr
+++ b/Master/bin/sparc-solaris/mktexlsr
@@ -10,7 +10,7 @@
 # Originally written as `texhash' by Thomas Esser, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr 36626 2015-03-25 22:51:45Z karl $'
+version='$Id: mktexlsr 36855 2015-04-14 12:15:08Z preining $'
 progname=`echo $0 | sed 's%.*/%%'`
 
 usage="Usage: $progname [OPTION]... [DIR]...
@@ -73,7 +73,7 @@ if tty -s; then verbose=true; else verbose=false; fi
 dry_run=false
 trees=
 
-treefile=`mktemp --tmpdir mktexlsrtrees.XXXXXXXXXX` || exit 1
+treefile="${TMPDIR-/tmp}/mktexlsrtrees$$.tmp"
 trap 'cd /; rm -f $treefile; test -z "$db_dir_tmp" || rm -rf "$db_dir_tmp"; 
       exit' 0 1 2 3 7 13 15
 
diff --git a/Master/bin/universal-darwin/mktexlsr b/Master/bin/universal-darwin/mktexlsr
index d0b77417835..3161a5317ec 100755
--- a/Master/bin/universal-darwin/mktexlsr
+++ b/Master/bin/universal-darwin/mktexlsr
@@ -10,7 +10,7 @@
 # Originally written as `texhash' by Thomas Esser, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr 36626 2015-03-25 22:51:45Z karl $'
+version='$Id: mktexlsr 36855 2015-04-14 12:15:08Z preining $'
 progname=`echo $0 | sed 's%.*/%%'`
 
 usage="Usage: $progname [OPTION]... [DIR]...
@@ -73,7 +73,7 @@ if tty -s; then verbose=true; else verbose=false; fi
 dry_run=false
 trees=
 
-treefile=`mktemp --tmpdir mktexlsrtrees.XXXXXXXXXX` || exit 1
+treefile="${TMPDIR-/tmp}/mktexlsrtrees$$.tmp"
 trap 'cd /; rm -f $treefile; test -z "$db_dir_tmp" || rm -rf "$db_dir_tmp"; 
       exit' 0 1 2 3 7 13 15
 
diff --git a/Master/bin/x86_64-cygwin/mktexlsr b/Master/bin/x86_64-cygwin/mktexlsr
index d0b77417835..3161a5317ec 100755
--- a/Master/bin/x86_64-cygwin/mktexlsr
+++ b/Master/bin/x86_64-cygwin/mktexlsr
@@ -10,7 +10,7 @@
 # Originally written as `texhash' by Thomas Esser, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr 36626 2015-03-25 22:51:45Z karl $'
+version='$Id: mktexlsr 36855 2015-04-14 12:15:08Z preining $'
 progname=`echo $0 | sed 's%.*/%%'`
 
 usage="Usage: $progname [OPTION]... [DIR]...
@@ -73,7 +73,7 @@ if tty -s; then verbose=true; else verbose=false; fi
 dry_run=false
 trees=
 
-treefile=`mktemp --tmpdir mktexlsrtrees.XXXXXXXXXX` || exit 1
+treefile="${TMPDIR-/tmp}/mktexlsrtrees$$.tmp"
 trap 'cd /; rm -f $treefile; test -z "$db_dir_tmp" || rm -rf "$db_dir_tmp"; 
       exit' 0 1 2 3 7 13 15
 
diff --git a/Master/bin/x86_64-darwin/mktexlsr b/Master/bin/x86_64-darwin/mktexlsr
index d0b77417835..3161a5317ec 100755
--- a/Master/bin/x86_64-darwin/mktexlsr
+++ b/Master/bin/x86_64-darwin/mktexlsr
@@ -10,7 +10,7 @@
 # Originally written as `texhash' by Thomas Esser, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr 36626 2015-03-25 22:51:45Z karl $'
+version='$Id: mktexlsr 36855 2015-04-14 12:15:08Z preining $'
 progname=`echo $0 | sed 's%.*/%%'`
 
 usage="Usage: $progname [OPTION]... [DIR]...
@@ -73,7 +73,7 @@ if tty -s; then verbose=true; else verbose=false; fi
 dry_run=false
 trees=
 
-treefile=`mktemp --tmpdir mktexlsrtrees.XXXXXXXXXX` || exit 1
+treefile="${TMPDIR-/tmp}/mktexlsrtrees$$.tmp"
 trap 'cd /; rm -f $treefile; test -z "$db_dir_tmp" || rm -rf "$db_dir_tmp"; 
       exit' 0 1 2 3 7 13 15
 
diff --git a/Master/bin/x86_64-linux/mktexlsr b/Master/bin/x86_64-linux/mktexlsr
index d0b77417835..3161a5317ec 100755
--- a/Master/bin/x86_64-linux/mktexlsr
+++ b/Master/bin/x86_64-linux/mktexlsr
@@ -10,7 +10,7 @@
 # Originally written as `texhash' by Thomas Esser, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr 36626 2015-03-25 22:51:45Z karl $'
+version='$Id: mktexlsr 36855 2015-04-14 12:15:08Z preining $'
 progname=`echo $0 | sed 's%.*/%%'`
 
 usage="Usage: $progname [OPTION]... [DIR]...
@@ -73,7 +73,7 @@ if tty -s; then verbose=true; else verbose=false; fi
 dry_run=false
 trees=
 
-treefile=`mktemp --tmpdir mktexlsrtrees.XXXXXXXXXX` || exit 1
+treefile="${TMPDIR-/tmp}/mktexlsrtrees$$.tmp"
 trap 'cd /; rm -f $treefile; test -z "$db_dir_tmp" || rm -rf "$db_dir_tmp"; 
       exit' 0 1 2 3 7 13 15
 
diff --git a/Master/bin/x86_64-solaris/mktexlsr b/Master/bin/x86_64-solaris/mktexlsr
index abb5d05b349..3161a5317ec 100755
--- a/Master/bin/x86_64-solaris/mktexlsr
+++ b/Master/bin/x86_64-solaris/mktexlsr
@@ -7,12 +7,12 @@
 # Suitable for calling from cron, as in:
 # 0 * * * * cd /your/texmf/root && /usr/local/texlive/bin/mktexlsr
 # 
-# Originally written as `texhash' by Thomas Esser
-# <te@dbs.uni-hannover.de>, Okt., 1994.
+# Originally written as `texhash' by Thomas Esser, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr 31723 2013-09-21 22:43:41Z karl $'
+version='$Id: mktexlsr 36855 2015-04-14 12:15:08Z preining $'
 progname=`echo $0 | sed 's%.*/%%'`
+
 usage="Usage: $progname [OPTION]... [DIR]...
 
 Rebuild ls-R filename databases used by TeX.  If one or more arguments
@@ -33,9 +33,16 @@ If standard input is a terminal, --verbose is on by default.
 For more information, see the \`Filename database' section of
 Kpathsea manual available at http://tug.org/kpathsea.
 
-Report bugs to tex-k@tug.org.
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
 "
 
+# The simple PATH-prepending approach we take in other scripts doesn't
+# handle DOS/Windows, but we don't use the shell scripts on Windows
+# anyway, and does anyone want current TL on DOS or DJGPP?  Maybe they
+# can maintain their own changes if so.  Leaving this code though, since
+# it's always been here ...
+
 # MS-DOS and MS-Windows define $COMSPEC or $ComSpec and use `;' to separate
 # directories in path lists whereas Unix uses `:'.  Make an exception for
 # Cygwin, which pretends to be UNIX.