summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-06-17 18:00:24 +0000
committerNorbert Preining <preining@logic.at>2008-06-17 18:00:24 +0000
commit8b8ab3a9822c66c0216539da88c62c9554dc9442 (patch)
treed858f39139f1aab29201b99aaef3c99eac51139c
parent902b8aa027934fca162016dcbcbfd6f60e418706 (diff)
fmtutil: add fix for wrong infinite recursion warning by adding the engine
to the loop detection variable git-svn-id: svn://tug.org/texlive/trunk@8815 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/tetex/ChangeLog5
-rwxr-xr-xBuild/source/texk/tetex/fmtutil4
-rwxr-xr-xMaster/bin/alpha-linux/fmtutil4
-rwxr-xr-xMaster/bin/amd64-freebsd/fmtutil4
-rwxr-xr-xMaster/bin/hppa-hpux/fmtutil4
-rwxr-xr-xMaster/bin/i386-darwin/fmtutil4
-rwxr-xr-xMaster/bin/i386-freebsd/fmtutil4
-rwxr-xr-xMaster/bin/i386-linux/fmtutil4
-rwxr-xr-xMaster/bin/i386-openbsd/fmtutil4
-rwxr-xr-xMaster/bin/i386-solaris/fmtutil4
-rwxr-xr-xMaster/bin/mips-irix/fmtutil4
-rwxr-xr-xMaster/bin/powerpc-aix/fmtutil4
-rwxr-xr-xMaster/bin/powerpc-darwin/fmtutil4
-rwxr-xr-xMaster/bin/powerpc-linux/fmtutil4
-rwxr-xr-xMaster/bin/sparc-linux/fmtutil4
-rwxr-xr-xMaster/bin/sparc-solaris/fmtutil4
-rwxr-xr-xMaster/bin/x86_64-linux/fmtutil4
17 files changed, 37 insertions, 32 deletions
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog
index 99927d9f8f6..be6c236d244 100644
--- a/Build/source/texk/tetex/ChangeLog
+++ b/Build/source/texk/tetex/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-17 Norbert Preining <preining@logic.at>
+
+ * fmtutil: add the engine setting to the infinite-loop-detection
+ variable.
+
2008-06-15 Karl Berry <karl@tug.org>
* Makefile.in (run_mktexlsr): no need to set TEXMFDBS, cmdline
diff --git a/Build/source/texk/tetex/fmtutil b/Build/source/texk/tetex/fmtutil
index 8f35dfdec0f..e3cdde40f6b 100755
--- a/Build/source/texk/tetex/fmtutil
+++ b/Build/source/texk/tetex/fmtutil
@@ -682,10 +682,10 @@ run_initex()
# Check for infinite recursion before running the iniTeX:
case :$mktexfmt_loop: in
- *:"$format":*)
+ *:"$format/$engine":*)
abort "Infinite recursion detected, giving up!" ;;
esac
- mktexfmt_loop=$mktexfmt_loop:$format
+ mktexfmt_loop=$mktexfmt_loop:$format/$engine
export mktexfmt_loop
verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
diff --git a/Master/bin/alpha-linux/fmtutil b/Master/bin/alpha-linux/fmtutil
index 8f35dfdec0f..e3cdde40f6b 100755
--- a/Master/bin/alpha-linux/fmtutil
+++ b/Master/bin/alpha-linux/fmtutil
@@ -682,10 +682,10 @@ run_initex()
# Check for infinite recursion before running the iniTeX:
case :$mktexfmt_loop: in
- *:"$format":*)
+ *:"$format/$engine":*)
abort "Infinite recursion detected, giving up!" ;;
esac
- mktexfmt_loop=$mktexfmt_loop:$format
+ mktexfmt_loop=$mktexfmt_loop:$format/$engine
export mktexfmt_loop
verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
diff --git a/Master/bin/amd64-freebsd/fmtutil b/Master/bin/amd64-freebsd/fmtutil
index 8f35dfdec0f..e3cdde40f6b 100755
--- a/Master/bin/amd64-freebsd/fmtutil
+++ b/Master/bin/amd64-freebsd/fmtutil
@@ -682,10 +682,10 @@ run_initex()
# Check for infinite recursion before running the iniTeX:
case :$mktexfmt_loop: in
- *:"$format":*)
+ *:"$format/$engine":*)
abort "Infinite recursion detected, giving up!" ;;
esac
- mktexfmt_loop=$mktexfmt_loop:$format
+ mktexfmt_loop=$mktexfmt_loop:$format/$engine
export mktexfmt_loop
verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
diff --git a/Master/bin/hppa-hpux/fmtutil b/Master/bin/hppa-hpux/fmtutil
index 8f35dfdec0f..e3cdde40f6b 100755
--- a/Master/bin/hppa-hpux/fmtutil
+++ b/Master/bin/hppa-hpux/fmtutil
@@ -682,10 +682,10 @@ run_initex()
# Check for infinite recursion before running the iniTeX:
case :$mktexfmt_loop: in
- *:"$format":*)
+ *:"$format/$engine":*)
abort "Infinite recursion detected, giving up!" ;;
esac
- mktexfmt_loop=$mktexfmt_loop:$format
+ mktexfmt_loop=$mktexfmt_loop:$format/$engine
export mktexfmt_loop
verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
diff --git a/Master/bin/i386-darwin/fmtutil b/Master/bin/i386-darwin/fmtutil
index 8f35dfdec0f..e3cdde40f6b 100755
--- a/Master/bin/i386-darwin/fmtutil
+++ b/Master/bin/i386-darwin/fmtutil
@@ -682,10 +682,10 @@ run_initex()
# Check for infinite recursion before running the iniTeX:
case :$mktexfmt_loop: in
- *:"$format":*)
+ *:"$format/$engine":*)
abort "Infinite recursion detected, giving up!" ;;
esac
- mktexfmt_loop=$mktexfmt_loop:$format
+ mktexfmt_loop=$mktexfmt_loop:$format/$engine
export mktexfmt_loop
verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
diff --git a/Master/bin/i386-freebsd/fmtutil b/Master/bin/i386-freebsd/fmtutil
index 8f35dfdec0f..e3cdde40f6b 100755
--- a/Master/bin/i386-freebsd/fmtutil
+++ b/Master/bin/i386-freebsd/fmtutil
@@ -682,10 +682,10 @@ run_initex()
# Check for infinite recursion before running the iniTeX:
case :$mktexfmt_loop: in
- *:"$format":*)
+ *:"$format/$engine":*)
abort "Infinite recursion detected, giving up!" ;;
esac
- mktexfmt_loop=$mktexfmt_loop:$format
+ mktexfmt_loop=$mktexfmt_loop:$format/$engine
export mktexfmt_loop
verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
diff --git a/Master/bin/i386-linux/fmtutil b/Master/bin/i386-linux/fmtutil
index 8f35dfdec0f..e3cdde40f6b 100755
--- a/Master/bin/i386-linux/fmtutil
+++ b/Master/bin/i386-linux/fmtutil
@@ -682,10 +682,10 @@ run_initex()
# Check for infinite recursion before running the iniTeX:
case :$mktexfmt_loop: in
- *:"$format":*)
+ *:"$format/$engine":*)
abort "Infinite recursion detected, giving up!" ;;
esac
- mktexfmt_loop=$mktexfmt_loop:$format
+ mktexfmt_loop=$mktexfmt_loop:$format/$engine
export mktexfmt_loop
verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
diff --git a/Master/bin/i386-openbsd/fmtutil b/Master/bin/i386-openbsd/fmtutil
index 8f35dfdec0f..e3cdde40f6b 100755
--- a/Master/bin/i386-openbsd/fmtutil
+++ b/Master/bin/i386-openbsd/fmtutil
@@ -682,10 +682,10 @@ run_initex()
# Check for infinite recursion before running the iniTeX:
case :$mktexfmt_loop: in
- *:"$format":*)
+ *:"$format/$engine":*)
abort "Infinite recursion detected, giving up!" ;;
esac
- mktexfmt_loop=$mktexfmt_loop:$format
+ mktexfmt_loop=$mktexfmt_loop:$format/$engine
export mktexfmt_loop
verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
diff --git a/Master/bin/i386-solaris/fmtutil b/Master/bin/i386-solaris/fmtutil
index 8f35dfdec0f..e3cdde40f6b 100755
--- a/Master/bin/i386-solaris/fmtutil
+++ b/Master/bin/i386-solaris/fmtutil
@@ -682,10 +682,10 @@ run_initex()
# Check for infinite recursion before running the iniTeX:
case :$mktexfmt_loop: in
- *:"$format":*)
+ *:"$format/$engine":*)
abort "Infinite recursion detected, giving up!" ;;
esac
- mktexfmt_loop=$mktexfmt_loop:$format
+ mktexfmt_loop=$mktexfmt_loop:$format/$engine
export mktexfmt_loop
verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
diff --git a/Master/bin/mips-irix/fmtutil b/Master/bin/mips-irix/fmtutil
index 8f35dfdec0f..e3cdde40f6b 100755
--- a/Master/bin/mips-irix/fmtutil
+++ b/Master/bin/mips-irix/fmtutil
@@ -682,10 +682,10 @@ run_initex()
# Check for infinite recursion before running the iniTeX:
case :$mktexfmt_loop: in
- *:"$format":*)
+ *:"$format/$engine":*)
abort "Infinite recursion detected, giving up!" ;;
esac
- mktexfmt_loop=$mktexfmt_loop:$format
+ mktexfmt_loop=$mktexfmt_loop:$format/$engine
export mktexfmt_loop
verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
diff --git a/Master/bin/powerpc-aix/fmtutil b/Master/bin/powerpc-aix/fmtutil
index 8f35dfdec0f..e3cdde40f6b 100755
--- a/Master/bin/powerpc-aix/fmtutil
+++ b/Master/bin/powerpc-aix/fmtutil
@@ -682,10 +682,10 @@ run_initex()
# Check for infinite recursion before running the iniTeX:
case :$mktexfmt_loop: in
- *:"$format":*)
+ *:"$format/$engine":*)
abort "Infinite recursion detected, giving up!" ;;
esac
- mktexfmt_loop=$mktexfmt_loop:$format
+ mktexfmt_loop=$mktexfmt_loop:$format/$engine
export mktexfmt_loop
verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
diff --git a/Master/bin/powerpc-darwin/fmtutil b/Master/bin/powerpc-darwin/fmtutil
index 8f35dfdec0f..e3cdde40f6b 100755
--- a/Master/bin/powerpc-darwin/fmtutil
+++ b/Master/bin/powerpc-darwin/fmtutil
@@ -682,10 +682,10 @@ run_initex()
# Check for infinite recursion before running the iniTeX:
case :$mktexfmt_loop: in
- *:"$format":*)
+ *:"$format/$engine":*)
abort "Infinite recursion detected, giving up!" ;;
esac
- mktexfmt_loop=$mktexfmt_loop:$format
+ mktexfmt_loop=$mktexfmt_loop:$format/$engine
export mktexfmt_loop
verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
diff --git a/Master/bin/powerpc-linux/fmtutil b/Master/bin/powerpc-linux/fmtutil
index 8f35dfdec0f..e3cdde40f6b 100755
--- a/Master/bin/powerpc-linux/fmtutil
+++ b/Master/bin/powerpc-linux/fmtutil
@@ -682,10 +682,10 @@ run_initex()
# Check for infinite recursion before running the iniTeX:
case :$mktexfmt_loop: in
- *:"$format":*)
+ *:"$format/$engine":*)
abort "Infinite recursion detected, giving up!" ;;
esac
- mktexfmt_loop=$mktexfmt_loop:$format
+ mktexfmt_loop=$mktexfmt_loop:$format/$engine
export mktexfmt_loop
verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
diff --git a/Master/bin/sparc-linux/fmtutil b/Master/bin/sparc-linux/fmtutil
index 8f35dfdec0f..e3cdde40f6b 100755
--- a/Master/bin/sparc-linux/fmtutil
+++ b/Master/bin/sparc-linux/fmtutil
@@ -682,10 +682,10 @@ run_initex()
# Check for infinite recursion before running the iniTeX:
case :$mktexfmt_loop: in
- *:"$format":*)
+ *:"$format/$engine":*)
abort "Infinite recursion detected, giving up!" ;;
esac
- mktexfmt_loop=$mktexfmt_loop:$format
+ mktexfmt_loop=$mktexfmt_loop:$format/$engine
export mktexfmt_loop
verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
diff --git a/Master/bin/sparc-solaris/fmtutil b/Master/bin/sparc-solaris/fmtutil
index 8f35dfdec0f..e3cdde40f6b 100755
--- a/Master/bin/sparc-solaris/fmtutil
+++ b/Master/bin/sparc-solaris/fmtutil
@@ -682,10 +682,10 @@ run_initex()
# Check for infinite recursion before running the iniTeX:
case :$mktexfmt_loop: in
- *:"$format":*)
+ *:"$format/$engine":*)
abort "Infinite recursion detected, giving up!" ;;
esac
- mktexfmt_loop=$mktexfmt_loop:$format
+ mktexfmt_loop=$mktexfmt_loop:$format/$engine
export mktexfmt_loop
verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
diff --git a/Master/bin/x86_64-linux/fmtutil b/Master/bin/x86_64-linux/fmtutil
index 8f35dfdec0f..e3cdde40f6b 100755
--- a/Master/bin/x86_64-linux/fmtutil
+++ b/Master/bin/x86_64-linux/fmtutil
@@ -682,10 +682,10 @@ run_initex()
# Check for infinite recursion before running the iniTeX:
case :$mktexfmt_loop: in
- *:"$format":*)
+ *:"$format/$engine":*)
abort "Infinite recursion detected, giving up!" ;;
esac
- mktexfmt_loop=$mktexfmt_loop:$format
+ mktexfmt_loop=$mktexfmt_loop:$format/$engine
export mktexfmt_loop
verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."