preferentially use subprograms from our own directory

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

6 files changed, 55 insertions, 21 deletions

diff --git a/Build/source/texk/texlive/tl_scripts/ChangeLog b/Build/source/texk/texlive/tl_scripts/ChangeLog
index 07e6f464249..bbe3bc5e2eb 100644
--- a/Build/source/texk/texlive/tl_scripts/ChangeLog
+++ b/Build/source/texk/texlive/tl_scripts/ChangeLog
@@ -1,3 +1,10 @@
+2014-07-17  Karl Berry  <karl@tug.org>
+
+	* tcfmgr,
+	* fmtutil.sh,
+	* fmtutil-sys.sh:
+	* texconfig.1: prepend directory of executable to $PATH.
+
 2014-07-13  Karl Berry  <karl@tug.org>
 
 	* texconfig.sh,
diff --git a/Build/source/texk/texlive/tl_scripts/fmtutil-sys.sh b/Build/source/texk/texlive/tl_scripts/fmtutil-sys.sh
index bfb52f94e1f..58f899eb454 100755
--- a/Build/source/texk/texlive/tl_scripts/fmtutil-sys.sh
+++ b/Build/source/texk/texlive/tl_scripts/fmtutil-sys.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-
+# $Id$
 # fmtutil-sys: Thomas Esser, public domain.
 
 # wrapper script for fmtutil with TEXMFVAR and TEXMFCONFIG set to
@@ -19,6 +19,11 @@ unset RUNNING_BSH
 test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 export PATH
 
+# preferentially use subprograms from our own directory.
+mydir=`echo "$0" | sed 's,/[^/]*$,,'`
+mydir=`cd "$mydir" && pwd`
+PATH="$mydir:$PATH"; export PATH
+
 v=`kpsewhich -var-value TEXMFSYSVAR`
 c=`kpsewhich -var-value TEXMFSYSCONFIG`
 
diff --git a/Build/source/texk/texlive/tl_scripts/fmtutil.1 b/Build/source/texk/texlive/tl_scripts/fmtutil.1
index 39ed57bf8b5..c97449986b7 100644
--- a/Build/source/texk/texlive/tl_scripts/fmtutil.1
+++ b/Build/source/texk/texlive/tl_scripts/fmtutil.1
@@ -1,4 +1,4 @@
-.TH FMTUTIL 1 "June 2011" "TeX Live" "TeX Live"
+.TH FMTUTIL 1 "July 2014" "TeX Live" "TeX Live"
 .SH "NAME"
 fmtutil \- utility for maintaining TeX format files
 .PP
@@ -13,7 +13,8 @@ fmtutil-sys \- utility for maintaining TeX format files system\-wide
 .I COMMAND
 .SH "DESCRIPTION"
 \fBfmtutil\fP is used to create or recreate format and hyphenation
-files or show information about format files\&.
+files or show information about format files\&.  The directory in which
+\fBfmtutil\fP is found is also preferentially used to find subprograms.
 .PP
 \fICOMMAND\fP is one of:
 .PP
@@ -88,6 +89,10 @@ directory for format files generated by
 .B --no-engine-subdir
 don't use engine-specific subdir of the fmtdir
 .TP
+.BI --no-error-if-no-engine \ engine1,engine2,...
+exit successfully even if the required engine is missing, if that engine
+is included in the list here.
+.TP
 .B --no-error-if-no-format
 exit successfully if no format is selected
 .TP
@@ -99,15 +104,23 @@ be silent
 .SH "FILES"
 .TP
 .I fmtutil\&.cnf
-default configuration file
+default configuration file; run \fIkpsewhich fmtutil.cnf\fP to see the
+active file.
+.PP
+The command \fIkpsewhich --engine=/ --all foo.fmt\fP  should show the
+locations of any and all \fIfoo.fmt\fP files.
+.PP
+For more information about fmt generation in TeX Live, try
+"tlmgr --help" or see http://tug.org/texlive/doc/tlmgr.html.
+The "generate" action in tlmgr does the work.
 .SH "SEE ALSO"
 .BR kpsewhich (1)
 .SH "BUGS"
-None known, but report any bugs found to <tex-k@tug.org> (mailing list).
+Please send bug reports to <tex-k@tug.org> (public mailing list).
 .SH "AUTHOR"
-\fBfmtutil\fP was written by Thomas Esser
-<te@dbs\&.uni-hannover\&.de> and is in the public domain.
+\fBfmtutil\fP was originally written by Thomas Esser
+and is in the public domain.  It is now maintained as part of TeX Live.
 .PP
-This manual page was written by C\&.M\&. Connelly
-<c@eskimo\&.com>, for
-the Debian GNU/Linux system and later slightly adapted for the teTeX 3 release\&.
+This manual page was written by C\&.M\&. Connelly <c@eskimo\&.com>, for
+the Debian GNU/Linux system and later slightly adapted for the teTeX 3
+release\&.
diff --git a/Build/source/texk/texlive/tl_scripts/fmtutil.sh b/Build/source/texk/texlive/tl_scripts/fmtutil.sh
index d4f6d4e0902..170f7dc6736 100755
--- a/Build/source/texk/texlive/tl_scripts/fmtutil.sh
+++ b/Build/source/texk/texlive/tl_scripts/fmtutil.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $Id$
 # fmtutil - utility to maintain format files.
 # Public domain.  Originally written by Thomas Esser.
 # Run with --help for usage.
@@ -57,12 +58,15 @@ unset RUNNING_BSH
 # hack around a bug in zsh:
 test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
+# preferentially use subprograms from our own directory.
+mydir=`echo "$0" | sed 's,/[^/]*$,,'`
+mydir=`cd "$mydir" && pwd`
+PATH="$mydir:$PATH"; export PATH
+
+version='$Id$'
 progname=fmtutil
 argv0=$0
-version='$Id$'
-
 cnf=fmtutil.cnf   # name of the config file
-export PATH
 
 ###############################################################################
 # cleanup()
@@ -104,12 +108,11 @@ Optional behavior:
   --cnffile FILE             read FILE instead of fmtutil.cnf.
   --fmtdir DIRECTORY
   --no-engine-subdir         don't use engine-specific subdir of the fmtdir
-  --no-error-if-no-format    exit successfully if no format is selected
-  --no-error-if-no-engine=ENGINE1,ENGINE2,...
+  --no-error-if-no-engine ENGINE1,ENGINE2,...
                              exit successfully even if the required engine
-                               is missing, if it is included in the list.
+                               is missing, if it is included in this list
+  --no-error-if-no-format    exit successfully if no format is selected
   --quiet                    be silent
-  --test                     (not implemented, just for compatibility)
   --dolinks                  (not implemented, just for compatibility)
   --force                    (not implemented, just for compatibility)
 
diff --git a/Build/source/texk/texlive/tl_scripts/tcfmgr b/Build/source/texk/texlive/tl_scripts/tcfmgr
index e79be96f873..e40ed352371 100755
--- a/Build/source/texk/texlive/tl_scripts/tcfmgr
+++ b/Build/source/texk/texlive/tl_scripts/tcfmgr
@@ -1,5 +1,7 @@
 #!/bin/sh
 # $Id$
+# tcfmgr - TeX configuration file manager (sort of).
+# Public domain.  Originally written by Thomas Esser.
 
 # invoke the right shell:
 
@@ -13,7 +15,10 @@ test -f /bin/bsh && test -z "$RUNNING_BSH" \
   && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
 unset RUNNING_BSH
 
-export PATH
+# preferentially use subprograms from our own directory.
+mydir=`echo "$0" | sed 's,/[^/]*$,,'`
+mydir=`cd "$mydir" && pwd`
+PATH="$mydir:$PATH"; export PATH
 
 # hack around a bug in zsh:
 test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
diff --git a/Build/source/texk/texlive/tl_scripts/texconfig.1 b/Build/source/texk/texlive/tl_scripts/texconfig.1
index ad31f31d9c7..0963b2257a9 100644
--- a/Build/source/texk/texlive/tl_scripts/texconfig.1
+++ b/Build/source/texk/texlive/tl_scripts/texconfig.1
@@ -12,9 +12,10 @@ texconfig-sys \- configures teTeX or TeX Live system\-wide
 .B texconfig-sys
 .SH DESCRIPTION
 .I texconfig
-allows one to configure and maintain TeX
-in an easy and convenient manner, offering a series of dialog boxes to
-the user.
+allows one to configure and maintain TeX in an easy and convenient
+manner, offering a series of dialog boxes to the user.  The directory in
+which \fItexconfig\fP is found is also preferentially used to find
+subprograms.
 .PP
 The
 .I tlmgr