--- gforth/preforth.in	2008/07/16 19:44:11	1.3
+++ gforth/preforth.in	2012/12/31 15:25:18	1.11
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-#Copyright (C) 2008 Free Software Foundation, Inc.
+#Copyright (C) 2008,2011,2012 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -17,13 +17,15 @@
 #You should have received a copy of the GNU General Public License
 #along with this program. If not, see http://www.gnu.org/licenses/.
 
-test -z "$ENGINE" && ENGINE=./gforth
-if test -x $ENGINE -a -f @kernel_fi@; then 
+@NO_CROSS@test -z "$ENGINE" && ENGINE=./gforth@ARCH@
+@NO_CROSS@test -f "@srcdir@/@kernel_fi@" && KERNEL="@srcdir@/@kernel_fi@"
+@NO_CROSS@test -f "@kernel_fi@" && KERNEL="@kernel_fi@"
+if test -f "$ENGINE" -a -f "$KERNEL"; then 
   path1="$1"
   path2="$2"
   shift; shift
 #  set -x -v
-  $ENGINE -i @kernel_fi@ $path1 $path2 exboot.fs startup.fs "$@"
+  $ENGINE --die-on-signal -i @kernel_fi@ $path1 $path2 exboot.fs startup.fs "$@"
 else
   @PREFORTH@ "$@"
 fi