diff options
| -rw-r--r-- | Build/source/texk/tetex/ChangeLog | 6 | ||||
| -rwxr-xr-x | Build/source/texk/tetex/texconfig | 18 | ||||
| -rwxr-xr-x | Build/source/texk/tetex/texconfig-sys | 2 | ||||
| -rwxr-xr-x | Master/bin/i386-linux/texconfig | 18 | ||||
| -rwxr-xr-x | Master/bin/i386-linux/texconfig-sys | 2 |
5 files changed, 36 insertions, 10 deletions
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog index d89db5e50ed..0ead26cf709 100644 --- a/Build/source/texk/tetex/ChangeLog +++ b/Build/source/texk/tetex/ChangeLog @@ -1,3 +1,9 @@ +2007-09-30 Karl Berry <karl@tug.org> + + * texconfig-sys: export texconfig_sys. + * texconfig <init>: use it to figure out which fmtutil/updmap. + Report from Frank K, 11 Jun 2007 17:05:43. + 2007-09-10 Karl Berry <karl@tug.org> * updmap.pl: TEXMFVAR rather than VARTEXMF. diff --git a/Build/source/texk/tetex/texconfig b/Build/source/texk/tetex/texconfig index 3637daf8cd6..d9ee85bd948 100755 --- a/Build/source/texk/tetex/texconfig +++ b/Build/source/texk/tetex/texconfig @@ -1,6 +1,6 @@ #!/bin/sh -# TeX-Config version 3.0 +# TeXConfig version 3.0 # Thomas Esser, te@dbs.uni-hannover.de. Public domain. # invoke the right shell: @@ -24,7 +24,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=texconfig # the version string -version=1184605103 # seconds since `00:00:00 1970-01-01 UTC' +version=1191175376 # seconds since `00:00:00 1970-01-01 UTC' # date '+%s' (with GNU date) envVars=" @@ -1118,11 +1118,19 @@ $formatsForHyphenFmt" ;; init) + if test -n "$texconfig_sys"; then # set by texconfig-sys + fmtutil=fmtutil-sys + updmap=updmap-sys + else + fmtutil=fmtutil + updmap=updmap + fi + case $2 in "") - if fmtutil --all \ + if $fmtutil --all \ && texlinks --multiplatform \ - && updmap; then + && $updmap; then : else rc=1 @@ -1131,7 +1139,7 @@ $formatsForHyphenFmt" *) shift 1 for i in "$@"; do - fmtutil --byfmt "$i" || rc=1 + $fmtutil --byfmt "$i" || rc=1 done ;; esac diff --git a/Build/source/texk/tetex/texconfig-sys b/Build/source/texk/tetex/texconfig-sys index 9d193722416..a67854789c4 100755 --- a/Build/source/texk/tetex/texconfig-sys +++ b/Build/source/texk/tetex/texconfig-sys @@ -1,4 +1,5 @@ #!/bin/sh +# $Id$ # texconfig-sys: Thomas Esser, public domain. @@ -25,6 +26,7 @@ c=`kpsewhich -var-value TEXMFSYSCONFIG` TEXMFVAR="$v" TEXMFCONFIG="$c" +texconfig_sys=1 export TEXMFVAR TEXMFCONFIG exec texconfig ${1+"$@"} diff --git a/Master/bin/i386-linux/texconfig b/Master/bin/i386-linux/texconfig index 3637daf8cd6..d9ee85bd948 100755 --- a/Master/bin/i386-linux/texconfig +++ b/Master/bin/i386-linux/texconfig @@ -1,6 +1,6 @@ #!/bin/sh -# TeX-Config version 3.0 +# TeXConfig version 3.0 # Thomas Esser, te@dbs.uni-hannover.de. Public domain. # invoke the right shell: @@ -24,7 +24,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=texconfig # the version string -version=1184605103 # seconds since `00:00:00 1970-01-01 UTC' +version=1191175376 # seconds since `00:00:00 1970-01-01 UTC' # date '+%s' (with GNU date) envVars=" @@ -1118,11 +1118,19 @@ $formatsForHyphenFmt" ;; init) + if test -n "$texconfig_sys"; then # set by texconfig-sys + fmtutil=fmtutil-sys + updmap=updmap-sys + else + fmtutil=fmtutil + updmap=updmap + fi + case $2 in "") - if fmtutil --all \ + if $fmtutil --all \ && texlinks --multiplatform \ - && updmap; then + && $updmap; then : else rc=1 @@ -1131,7 +1139,7 @@ $formatsForHyphenFmt" *) shift 1 for i in "$@"; do - fmtutil --byfmt "$i" || rc=1 + $fmtutil --byfmt "$i" || rc=1 done ;; esac diff --git a/Master/bin/i386-linux/texconfig-sys b/Master/bin/i386-linux/texconfig-sys index 9d193722416..a67854789c4 100755 --- a/Master/bin/i386-linux/texconfig-sys +++ b/Master/bin/i386-linux/texconfig-sys @@ -1,4 +1,5 @@ #!/bin/sh +# $Id$ # texconfig-sys: Thomas Esser, public domain. @@ -25,6 +26,7 @@ c=`kpsewhich -var-value TEXMFSYSCONFIG` TEXMFVAR="$v" TEXMFCONFIG="$c" +texconfig_sys=1 export TEXMFVAR TEXMFCONFIG exec texconfig ${1+"$@"} |