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

15 files changed, 30 insertions, 30 deletions

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' ..."