--- gforth/Makefile.in	2003/11/06 09:47:49	1.288
+++ gforth/Makefile.in	2004/01/18 22:00:20	1.292
@@ -76,7 +76,7 @@ FORTHS	= $(ENGINE) $(FORTHS_ARGS)
 # possible to override this variable at the command line for an initial build (jaw)
 BUILDFORTH = $(ENGINE) --die-on-signal -m 4M -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)
 # the forth system plus flags we use to build
-FORTHB = $(BUILDFORTH) -e 3 exboot.fs -e 'fpath= .|~+|$(srcdir)'
+FORTHB = $(BUILDFORTH) -e 0 exboot.fs -e 'fpath= .|~+|$(srcdir)'
 # the Forth system for running prims2x.fs
 FORTHP = $(FORTH)
 ENGINE_FAST = $(ENGINE)-fast
@@ -86,7 +86,7 @@ FORTHK	= $(ENGINE) $(FORTHKFLAGS)
 #FORTHP	= $(ENGINE) --die-on-signal -i ./$(kernel_fi)
 #the "-2 image-included-files +!" undoes the change to image-included-files
 # in exboot.fs
-STARTUP	= -e 3 exboot.fs startup.fs @asm_fs@ @disasm_fs@
+STARTUP	= -e 0 exboot.fs startup.fs @asm_fs@ @disasm_fs@
 STRIP	= strip
 TEXI2DVI = texi2dvi -e
 TEXI2PDF = texi2dvi --pdf -e
@@ -248,6 +248,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \
 	test/string.fs test/float.fs test/gforth.fs \
 	test/other.fs test/signals.fs test/checkans.fs \
+	test/primtest.fs \
 	bubble.fs siev.fs matrix.fs fib.fs \
 	oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \
 	moofglos.fs fixpath.fs \
@@ -295,6 +296,7 @@ ARCHS =	\
 	arch/misc/README \
 	arch/misc/asm.fs \
 	arch/misc/mach.fs \
+	arch/misc/optcmove.fs \
 	arch/misc/prim.fs \
 	arch/misc/sim.fs \
 	arch/misc/sokoban.fs \
@@ -608,6 +610,8 @@ checkone test:	gforth$(EXE) gforth.fi
 test/primtest.fi: test/primtest.fs mach32l.fs cross.fs
 		$(FORTHB) -e 's" mach32l.fs"' $(srcdir)/test/primtest.fs -e "save-cross $@ $(bindir)/gforth-$(VERSION) bye"
 
+primtest:	gforth gforth-native test/primtest.fi FORCE
+		(echo rs|ENVVAR=bla ./gforth -i test/primtest.fi) && (echo rs|ENVVAR=bla ./gforth-native -i test/primtest.fi); echo $$?
 
 bench:		gforth-fast$(EXE) gforth.fi
 		@echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)'
@@ -717,7 +721,7 @@ prim-fast.b:	prim cache1.vmg peeprules.v
 		sleep 1 #should make hpux-workaround unnecessary
 
 $(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs
-		GFORTH="$(FORTHP)" gfgen -fast
+		GFORTH="$(FORTHP)" $(srcdir)/gfgen -fast
 
 $(FORTH_GEN_ENGINE): prim.b prims2x.fs
 		GFORTH="$(FORTHP)" gfgen