--- gforth/vmgen.in	2002/08/20 07:59:01	1.2
+++ gforth/vmgen.in	2003/08/25 14:17:47	1.6
@@ -1,6 +1,6 @@
 #! /bin/sh
 # @configure_input@
-#Copyright (C) 2001 Free Software Foundation, Inc.
+#Copyright (C) 2001,2002,2003 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -20,15 +20,15 @@
 
 prefix=@prefix@
 test "x$GFORTHDIR" != x || GFORTHDIR=@exec_prefix@/bin
-test "x$GFORTHDATADIR" != x || GFORTHDATADIR=$prefix/share/gforth/@VERSION@
+test "x$GFORTHDATADIR" != x || GFORTHDATADIR=$prefix/share/gforth/@PACKAGE_VERSION@
 GFORTH=$GFORTHDIR/gforth-fast
 if test $# = 0 || test $1 = --help || test $1 = -h; then
   echo "usage: `basename $0` <file>.vmg"
   exit 0
 elif test $1 = --version || test $1 = -v; then
-  echo "vmgen (@PACKAGE@) @VERSION@"
+  echo "vmgen (@PACKAGE_NAME@) @PACKAGE_VERSION@"
   $GFORTH --version
-  echo 'Copyright (C) 2001 Free Software Foundation, Inc.'
+  echo 'Copyright (C) 2001,2002,2003 Free Software Foundation, Inc.'
   echo 'This program is part of Gforth'
   $GFORTH -e "license bye"
   exit 0
@@ -36,7 +36,7 @@ else
     true #old shells require this
 fi
 file=`basename $1 .vmg`
-$GFORTH -m 1000000 -e "create vmgen" $GFORTHDATADIR/prims2x.fs -e "c-flag on s\" $1\" ' output-c ' output-c-combined process-file bye" > $file-vm.i &&
+$GFORTH -m 1000000 -e "create vmgen" $GFORTHDATADIR/prims2x.fs -e "c-flag on s\" $file-vm.i\" out-filename 2! s\" $1\" ' output-c ' output-c-combined process-file bye" > $file-vm.i &&
 $GFORTH -m 1000000 -e "create vmgen" $GFORTHDATADIR/prims2x.fs -e "c-flag on s\" $1\" ' output-disasm dup process-file bye" > $file-disasm.i &&
 $GFORTH -m 1000000 -e "create vmgen" $GFORTHDATADIR/prims2x.fs -e "c-flag on s\" $1\" ' output-gen ' noop process-file bye" > $file-gen.i &&
 $GFORTH -m 1000000 -e "create vmgen" $GFORTHDATADIR/prims2x.fs -e "c-flag on s\" $1\" ' output-label dup process-file bye" > $file-labels.i &&