--- gforth/Makefile.in	1999/05/10 21:10:31	1.154
+++ gforth/Makefile.in	1999/06/17 19:54:34	1.158
@@ -62,7 +62,7 @@ INSTALL_DATA = @INSTALL_DATA@
 LN_S	= @LN_S@
 GCC	= @CC@
 CC	= $(GCC)
-FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)
+FORTHPATH = ~+$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)
 FORTHSIZES = @FORTHSIZES@
 FORTH_ARGS = --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir)
 ENGINE = ./gforth
@@ -123,6 +123,8 @@ CVSDIRS = CVS engine/CVS kernel/CVS doc/
 INCLUDES = engine/forth.h engine/threaded.h engine/io.h
 
 KERN_SRC = \
+	mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \
+	machpc.fs \
 	kernel/aliases0.fs \
 	kernel/aliases.fs \
 	kernel/args.fs \
@@ -138,7 +140,7 @@ KERN_SRC = \
 	kernel/main.fs \
 	kernel/prim0.fs \
 	search.fs \
-	kernel/special.fs \
+	kernel/quotes.fs \
 	kernel/tools.fs \
 	kernel/toolsext.fs \
 	kernel/vars.fs \
@@ -151,7 +153,8 @@ KERN_SRC = \
 	kernel/nio.fs \
 	kernel/saccept.fs \
 	kernel/doers.fs \
-	kernel/getdoers.fs
+	kernel/getdoers.fs \
+	kernel/pass.fs
 
 EC_SRC = \
 	asm/README \
@@ -162,11 +165,9 @@ EC_SRC = \
 	asm/target.fs \
 	ec/README \
 	ec/mirror.fs \
-	ec/mirrors.fs \
 	ec/shex.fs \
 	ec/builttag.fs \
 	ec/dotx.fs \
-	ec/mirrored.fs \
 	ec/nesting.fs
 
 GFORTH_FI_SRC = \
@@ -211,8 +212,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \
 	glosgen.fs gray.fs \
 	doc/makedoc.fs \
-	mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \
-	machpc.fs more.fs other.fs prims2x.fs random.fs \
+	more.fs other.fs prims2x.fs random.fs \
 	table.fs \
 	tt.fs sokoban.fs \
 	unbuffered.fs wordsets.fs \
@@ -305,7 +305,8 @@ SOURCES	= $(CVSDIRS) compat Makefile.in
 	configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \
 	gforthmi.cmd glosgen.glo doc/glossaries.doc \
 	$(INCLUDES) $(FORTH_SRC) $(COMPAT) \
-	timings.sc
+	timings.sc \
+	test/coretest.out test/checkans.out
 
 RCS_FILES =  ToDo model high-level
 
@@ -481,12 +482,9 @@ uninstall:	FORCE
 		@echo -e "To remove Gforth completely, type\n$(RM) -rf $(bindir)/gforth$(EXE) $(bindir)/gforthmi $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth"
 
 check test:	gforth$(EXE) gforth.fi
-		$(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs -e bye
+		$(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs -e bye | diff -c - $(srcdir)/test/coretest.out
 		$(FORTH) test/other.fs -e bye
-		@echo "Expect 'Missing: EKEY EKEY>CHAR EKEY? EMIT?'"
-		@echo "Expect 'Missing: EDITOR FORGET'"
-		$(FORTH) code.fs test/checkans.fs -e bye
-		@echo 'Expect no differences'
+		$(FORTH) code.fs test/checkans.fs -e bye | diff -c - $(srcdir)/test/checkans.out
 		$(FORTHK) -m 100000 prims2x.fs -e \
 		  "c-flag on s\" $(srcdir)/prim.b\" ' output-c process-file bye"| \
 		  diff -c - $(srcdir)/engine/prim.i
@@ -509,7 +507,7 @@ bench:		gforth-fast$(EXE) gforth.fi
 #    these are the ones we want to use now
 
 kernl16l.fi-:	$(KERN_SRC) kernel/version.fs mach16l.fs $(FORTH_GEN0)
-		$(FORTHK) -e 's" mach16l.fs"' kernel/main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye"
+		$(FORTHK) -e 's" mach16l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye"
 
 kernl16b.fi-:	$(KERN_SRC) kernel/version.fs mach16b.fs $(FORTH_GEN0)
 		$(FORTHK) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye"