--- gforth/gforthmi.in	1998/12/19 23:15:08	1.1
+++ gforth/gforthmi.in	2003/08/25 14:17:44	1.11
@@ -1,6 +1,6 @@
 #! /bin/sh
 # @configure_input@
-#Copyright (C) 1997,1998 Free Software Foundation, Inc.
+#Copyright (C) 1997,1998,2000,2002,2003 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -16,14 +16,14 @@
 
 #You should have received a copy of the GNU General Public License
 #along with this program; if not, write to the Free Software
-#Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-test "x$GFORTHD" != x || GFORTHD=$prefix/lib/gforth/@VERSION@/gforth-ditc
-test "x$GFORTH" != x || GFORTH=@bindir@/gforth-@VERSION@
+test "x$GFORTHD" != x || GFORTHD=$prefix/lib/gforth/@PACKAGE_VERSION@/gforth-ditc
+test "x$GFORTH" != x || GFORTH="@bindir@/gforth-@PACKAGE_VERSION@ --die-on-signal"
 if test $# = 0 || test $1 = --help || test $1 = -h; then
-  echo "usage: `basename $0` target-name [gforth-options]"
+  echo "usage: `basename $0` [--application] target-name [gforth-options]"
   echo "creates a relocatable image 'target-name'"
   echo "environment:"
   echo " \$GFORTHD (default: $GFORTHD): Engine used for creating the fixed images"
@@ -31,18 +31,29 @@ if test $# = 0 || test $1 = --help || te
   test $# != 0 || exit 1
   exit 0
 elif test $1 = --version || test $1 = -v; then
-  echo "gforthmi (@PACKAGE@) @VERSION@"
+  echo "gforthmi (@PACKAGE_NAME@) @PACKAGE_VERSION@"
   $GFORTH --version
-  echo 'Copyright (C) 1998 Free Software Foundation, Inc.'
+  echo 'Copyright (C) 1998,2002,2003 Free Software Foundation, Inc.'
   echo 'This program is part of Gforth'
   $GFORTH -e "license bye"
   exit 0
+elif test $1 = --application; then
+    application=yes
+    shift
+else
+    true #old shells require this
 fi
 outfile=$1; shift
 tmpfile=./temp-image.fi
-$GFORTHD --clear-dictionary --no-offset-im $* -e "savesystem $tmpfile"1" bye"
-$GFORTHD --clear-dictionary --offset-image $* -e "savesystem $tmpfile"2" bye"
+$GFORTHD --clear-dictionary --no-offset-im --die-on-signal "$@" -e "savesystem $tmpfile"1" bye"
+$GFORTHD --clear-dictionary --offset-image --die-on-signal "$@" -e "savesystem $tmpfile"2" bye"
 $GFORTH comp-i.fs -e "comp-image $tmpfile"1" $tmpfile"2" $outfile bye"
 chmod +x $outfile
 #gforth-0.2.1 -m 100000  comp-i.fs -e "comp-image $tmpfile"1" $tmpfile"2" $outfile bye"
 rm $tmpfile"1" $tmpfile"2"
+if test x$application = xyes; then
+    $GFORTH -e "s\" '$outfile\"" make-app.fs
+else
+    true #old shells require this
+fi
+