--- gforth/gforthmi.in	1999/07/24 13:07:19	1.4
+++ gforth/gforthmi.in	2012/04/03 22:40:14	1.19
@@ -1,12 +1,12 @@
-#! /bin/sh
+#! @SH@
 # @configure_input@
-#Copyright (C) 1997,1998 Free Software Foundation, Inc.
+#Copyright (C) 1997,1998,2000,2002,2003,2004,2007 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
 #Gforth is free software; you can redistribute it and/or
 #modify it under the terms of the GNU General Public License
-#as published by the Free Software Foundation; either version 2
+#as published by the Free Software Foundation, either version 3
 #of the License, or (at your option) any later version.
 
 #This program is distributed in the hope that it will be useful,
@@ -15,13 +15,19 @@
 #GNU General Public License for more details.
 
 #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.
+#along with this program; if not, see http://www.gnu.org/licenses/.
 
+startup="-i @kernel_fi@ exboot.fs startup.fs @asm_fs@ @disasm_fs@"
 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"
+if [ -f "@libdir@/gforth/@PACKAGE_VERSION@/gforth.fi" ]
+then
+  helper=""
+else
+  helper="$startup"
+fi
+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'"
@@ -31,25 +37,36 @@ 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,2007 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
+    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
+    outfile=$1; shift
+    generate="$@"
 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 $generate -e "savesystem $tmpfile"1" bye"
+$GFORTHD --clear-dictionary --offset-image --die-on-signal $generate -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