--- gforth/gforthmi.in	2012/03/21 00:53:06	1.16
+++ gforth/gforthmi.in	2012/06/21 23:28:00	1.20
@@ -1,4 +1,4 @@
-#! @SH@
+#! @mi_prefix@/bin/bash
 # @configure_input@
 #Copyright (C) 1997,1998,2000,2002,2003,2004,2007 Free Software Foundation, Inc.
 
@@ -19,15 +19,15 @@
 
 startup="-i @kernel_fi@ exboot.fs startup.fs @asm_fs@ @disasm_fs@"
 prefix=@prefix@
-exec_prefix=@exec_prefix@
+exec_prefix=@exec_prefix@@mi_prefix@
 if [ -f "@libdir@/gforth/@PACKAGE_VERSION@/gforth.fi" ]
 then
   helper=""
 else
   helper="$startup"
 fi
-test "x$GFORTHD" != x || GFORTHD="@bindir@/gforth-ditc-@PACKAGE_VERSION@ --die-on-signal"
-test "x$GFORTH" != x || GFORTH="@bindir@/gforth-@PACKAGE_VERSION@ --die-on-signal $helper"
+test "x$GFORTHD" != x || GFORTHD="@bindir@/gforth-ditc-@PACKAGE_VERSION@@ARCH@ --die-on-signal"
+test "x$GFORTH" != x || GFORTH="@bindir@/gforth-@PACKAGE_VERSION@@ARCH@ --die-on-signal $helper"
 if test $# = 0 || test $1 = --help || test $1 = -h; then
   echo "usage: `basename $0` [--application] target-name [gforth-options]"
   echo "creates a relocatable image 'target-name'"
@@ -46,15 +46,16 @@ elif test $1 = --version || test $1 = -v
 elif test $1 = --application; then
     application=yes
     shift
-    generate="$@"
     outfile=$1; shift
+    generate="$@"
 elif test $1 = --system; then
     shift
     generate=$startup
     outfile="@libdir@/gforth/@PACKAGE_VERSION@/gforth.fi"
+    export libccdir="@libexecdir@/gforth/@PACKAGE_VERSION@/libcc-named"
 else
-    generate="$@"
     outfile=$1; shift
+    generate="$@"
 fi
 tmpfile=./temp-image.fi
 $GFORTHD --clear-dictionary --no-offset-im --die-on-signal $generate -e "savesystem $tmpfile"1" bye"