--- gforth/vmgen.in	2007/12/31 18:40:24	1.7
+++ gforth/vmgen.in	2008/11/01 22:19:30	1.10
@@ -1,6 +1,6 @@
 #! /bin/sh
 # @configure_input@
-#Copyright (C) 2001,2002,2003 Free Software Foundation, Inc.
+#Copyright (C) 2001,2002,2003,2007,2008 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -27,17 +27,23 @@ if test $# = 0 || test $1 = --help || te
 elif test $1 = --version || test $1 = -v; then
   echo "vmgen (@PACKAGE_NAME@) @PACKAGE_VERSION@"
   $GFORTH --version
-  echo 'Copyright (C) 2001,2002,2003 Free Software Foundation, Inc.'
+  echo 'Copyright (C) 2001,2002,2003,2007,2008 Free Software Foundation, Inc.'
   echo 'This program is part of Gforth'
   $GFORTH -e "license bye"
   exit 0
 else
     true #old shells require this
 fi
+if grep -q vmgen-version $1; then
+    version=`grep vmgen-version $1|sed 's/^.*vmgen-version //'`
+else
+    version=0.6.2
+fi
+prims2x=$GFORTHDATADIR/prims2x$version.fs
 file=`basename $1 .vmg`
-$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 &&
-$GFORTH -m 1000000 -e "create vmgen" $GFORTHDATADIR/prims2x.fs -e "c-flag on s\" $1\" ' output-profile dup process-file bye" > $file-profile.i &&
-$GFORTH -m 1000000 -e "create vmgen" $GFORTHDATADIR/prims2x.fs -e "c-flag on s\" $1\" ' noop ' output-peephole process-file bye" > $file-peephole.i
+$GFORTH -m 1000000 -e "create vmgen" $prims2x -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" $prims2x -e "c-flag on s\" $1\" ' output-disasm dup process-file bye" > $file-disasm.i &&
+$GFORTH -m 1000000 -e "create vmgen" $prims2x -e "c-flag on s\" $1\" ' output-gen ' noop process-file bye" > $file-gen.i &&
+$GFORTH -m 1000000 -e "create vmgen" $prims2x -e "c-flag on s\" $1\" ' output-label dup process-file bye" > $file-labels.i &&
+$GFORTH -m 1000000 -e "create vmgen" $prims2x -e "c-flag on s\" $1\" ' output-profile dup process-file bye" > $file-profile.i &&
+$GFORTH -m 1000000 -e "create vmgen" $prims2x -e "c-flag on s\" $1\" ' noop ' output-peephole process-file bye" > $file-peephole.i