--- gforth/gforthmi.in	2012/03/21 00:58:54	1.17
+++ gforth/gforthmi.in	2012/04/03 22:40:14	1.19
@@ -26,8 +26,8 @@ then
 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'"
@@ -52,6 +52,7 @@ elif test $1 = --system; then
     shift
     generate=$startup
     outfile="@libdir@/gforth/@PACKAGE_VERSION@/gforth.fi"
+    export libccdir="@libexecdir@/gforth/@PACKAGE_VERSION@/libcc-named"
 else
     outfile=$1; shift
     generate="$@"