--- gforth/gforthmi.in	2000/09/23 15:46:56	1.7
+++ gforth/gforthmi.in	2004/12/31 13:23:57	1.13
@@ -1,6 +1,6 @@
 #! /bin/sh
 # @configure_input@
-#Copyright (C) 1997,1998,2000 Free Software Foundation, Inc.
+#Copyright (C) 1997,1998,2000,2002,2003,2004 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -20,8 +20,8 @@
 
 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@ --die-on-signal"
+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` [--application] target-name [gforth-options]"
   echo "creates a relocatable image 'target-name'"
@@ -31,9 +31,9 @@ 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,2004 Free Software Foundation, Inc.'
   echo 'This program is part of Gforth'
   $GFORTH -e "license bye"
   exit 0
@@ -45,14 +45,14 @@ else
 fi
 outfile=$1; shift
 tmpfile=./temp-image.fi
-$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"
+$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
+    $GFORTH -e "s\" $outfile\"" make-app.fs
 else
     true #old shells require this
 fi