sync config scripts and files from Build to Master

git-svn-id: svn://tug.org/texlive/trunk@36791 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 37 insertions, 10 deletions

diff --git a/Master/texmf-dist/web2c/mktex.opt b/Master/texmf-dist/web2c/mktex.opt
index bd5d0fbcc8f..48c594f2905 100644
--- a/Master/texmf-dist/web2c/mktex.opt
+++ b/Master/texmf-dist/web2c/mktex.opt
@@ -1,14 +1,15 @@
 # mktex.opt -- common mktex* options, etc.
-# Meant to be sourced after $usage, $version, and $MT_TEXMFMAIN have been set.
+# Meant to be sourced after $usage, $version, and $MT_TEXMFMAIN have been set,
+# and optionally mt_min_args and/or mt_max_args.
 # 
 # Originally written by Thomas Esser.  Public domain.
-# $Id: mktex.opt 18383 2010-05-20 18:31:24Z karl $
+# $Id: mktex.opt 34656 2014-07-18 23:38:50Z karl $
  
 if test "x$1" = x--help || test "x$1" = x-help; then
   echo "$usage"
   exit 0
 elif test "x$1" = x--version || test "x$1" = x-version; then
-  echo "`basename $0` $version"
+  echo "$0 $version"
   kpsewhich --version
   exit 0
 elif test $# -lt ${mt_min_args-1}; then
diff --git a/Master/texmf-dist/web2c/mktexdir b/Master/texmf-dist/web2c/mktexdir
index e9c2100d879..f39408b4c1f 100755
--- a/Master/texmf-dist/web2c/mktexdir
+++ b/Master/texmf-dist/web2c/mktexdir
@@ -6,8 +6,15 @@
 # Modified for sticky directory creation, --help, --version, more,
 # by Thomas Esser, Karl Berry, Olaf Weber, et al.
 
-version='$Id: mktexdir 18383 2010-05-20 18:31:24Z karl $'
-usage="Usage: $0 DIRS...
+version='$Id: mktexdir 34656 2014-07-18 23:38:50Z karl $'
+progname=`echo $0 | sed 's%.*/%%'`
+
+# preferentially use subprograms from our own directory.
+mydir=`echo "$0" | sed 's,/[^/]*$,,'`
+mydir=`cd "$mydir" && pwd`
+PATH="$mydir:$PATH"; export PATH
+
+usage="Usage: $0 DIR...
   Create each DIR, including any missing leading directories."
 mt_max_args=$#
 
diff --git a/Master/texmf-dist/web2c/mktexnam b/Master/texmf-dist/web2c/mktexnam
index e8956624118..7751f53ffd1 100755
--- a/Master/texmf-dist/web2c/mktexnam
+++ b/Master/texmf-dist/web2c/mktexnam
@@ -3,9 +3,19 @@
 # Primarily written by Thomas Esser, Karl Berry, and Olaf Weber.
 # Public domain.
 
-version='$Id: mktexnam 16497 2009-12-24 18:38:47Z karl $'
+version='$Id: mktexnam 34656 2014-07-18 23:38:50Z karl $'
+
+# preferentially use subprograms from our own directory.
+mydir=`echo "$0" | sed 's,/[^/]*$,,'`
+mydir=`cd "$mydir" && pwd`
+PATH="$mydir:$PATH"; export PATH
+
 usage="Usage: $0 NAME [DPI MODE] [DESTDIR].
-  Output the PK, TFM, and MF names for a font NAME."
+  Output the PK, TFM, and MF names for a font NAME.
+
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
+"
 mt_max_args=4
 
 # Common code for all scripts.
diff --git a/Master/texmf-dist/web2c/mktexupd b/Master/texmf-dist/web2c/mktexupd
index 1636e683f45..a4938d96eec 100755
--- a/Master/texmf-dist/web2c/mktexupd
+++ b/Master/texmf-dist/web2c/mktexupd
@@ -3,11 +3,20 @@
 # 
 # Primarily written by Thomas Esser, Karl Berry, and Olaf Weber.
 # Public domain.
-# $Id: mktexupd 18383 2010-05-20 18:31:24Z karl $
 
-version='$Id: mktexupd 18383 2010-05-20 18:31:24Z karl $'
+version='$Id: mktexupd 34656 2014-07-18 23:38:50Z karl $'
+
+# preferentially use subprograms from our own directory.
+mydir=`echo "$0" | sed 's,/[^/]*$,,'`
+mydir=`cd "$mydir" && pwd`
+PATH="$mydir:$PATH"; export PATH
+
 usage="Usage: $0 DIR FILE.
-  Update the ls-R file with an entry for FILE in DIR."
+  Update the ls-R file with an entry for FILE in DIR.
+
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
+"
 mt_min_args=2
 mt_max_args=2