--- gforth/Makefile.in	1999/03/23 20:24:15	1.151
+++ gforth/Makefile.in	1999/12/03 18:44:39	1.164
@@ -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
@@ -70,8 +70,8 @@ FORTH	= $(ENGINE) $(FORTH_ARGS)
 ENGINE_FAST = $(ENGINE)-fast
 FORTH_FAST	= $(ENGINE_FAST) $(FORTH_ARGS)
 FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)
-FORTHK	= ./gforth $(FORTHKFLAGS)
-FORTHP	= ./gforth --die-on-signal -i ./$(kernel_fi)
+FORTHK	= $(ENGINE) $(FORTHKFLAGS)
+FORTHP	= $(ENGINE) --die-on-signal -i ./$(kernel_fi)
 STRIP	= strip
 TEXI2DVI = texi2dvi
 DVI2PS	= dvips -Z
@@ -86,7 +86,7 @@ XDEFINES = @DEFS@
 SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions
 ENGINE_FLAGS = @ENGINE_FLAGS@ -fno-defer-pop -fcaller-saves
 DEBUGFLAG = @DEBUGFLAG@
-CFLAGS	= $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(FORTHPATH)\"
+CFLAGS	= $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O3 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(FORTHPATH)\"
 
 #John Wavrik should use -Xlinker -N to get a writable text (executable)
 XLDFLAGS = @LDFLAGS@
@@ -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 = \
@@ -177,9 +178,11 @@ GFORTH_FI_SRC = \
 	bufio.fs \
 	debug.fs \
 	debugs.fs \
+	ekey.fs \
 	savesys.fs \
 	environ.fs \
 	errors.fs \
+	exceptions.fs \
 	extend.fs \
 	float.fs \
 	glocals.fs \
@@ -210,9 +213,8 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	doskey.fs ds2texi.fs \
 	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 \
+	make-app.fs doc/makedoc.fs \
+	more.fs other.fs prims2x.fs random.fs \
 	table.fs \
 	tt.fs sokoban.fs \
 	unbuffered.fs wordsets.fs \
@@ -305,7 +307,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
 
@@ -455,6 +458,8 @@ install:	gforth$(EXE) $(FORTH_SRC) $(ker
 		GFORTHD="./gforth-ditc -p$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) startup.fs" ./gforthmi gforth.fi $(FORTHSIZES) startup.fs #gforth.fi contains some path names
 		$(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)
 		$(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS
+		# after install, remove these because they are owned by ROOT
+		$(RM) gforth.fi install.TAGS
 		@if test -d "$(emacssitelispdir)"; then \
 			$(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \
 		else \
@@ -481,13 +486,12 @@ 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'
-		$(FORTHK) -m 100000 prims2x.fs -e "s\" $(srcdir)/prim.b\"' output-c process-file bye"| diff -c - $(srcdir)/engine/prim.i
+		$(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
 
 bench:		gforth-fast$(EXE) gforth.fi
 		@echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)'
@@ -507,7 +511,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"
@@ -573,24 +577,24 @@ prim.b:		prim
 		m4 -s $(srcdir)/prim >$@ 
 
 engine/prim.i:		prim.b prims2x.fs
-		$(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-c process-file bye" >$@-
+		$(FORTHK) prims2x.fs -e "c-flag on s\" prim.b\" ' output-c process-file bye" >$@-
 		$(CP) $@- $@
 		$(RM) $@-
 
 engine/prim_lab.i:	prim.b prims2x.fs
-		$(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-label process-file bye" >$@-
+		$(FORTHK) prims2x.fs -e "c-flag on s\" prim.b\" ' output-label process-file bye" >$@-
 		$(CP) $@- $@
 		$(RM) $@-
 
 kernel/aliases.fs:	prim.b prims2x.fs kernel/aliases0.fs
 		$(CP) kernel/aliases0.fs $@-
-		$(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-alias process-file bye" >>$@-
+		$(FORTHK) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias process-file bye" >>$@-
 		$(CP) $@- $@
 		$(RM) $@-
 
 kernel/prim.fs:	prim.b prims2x.fs kernel/prim0.fs
 		$(CP) kernel/prim0.fs kernel/prim.fs-
-		$(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-forth process-file bye" >>$@-
+		$(FORTHK) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-forth process-file bye" >>$@-
 		$(CP) $@- $@
 		$(RM) $@-
 
@@ -669,16 +673,21 @@ doc/gforth.info doc/gforth.info-*: $(GFO
 html:		$(GFORTH_TEXI)
 		-$(RMTREE) html
 		-mkdir html
+### need makeinfo 4.0 to generate html. Otherwise, use texi2html..
+###		cd html; $(MAKEINFO) --html -I ../doc ../doc/gforth.texi
 		cd html; $(TEXI2HTML) -menu -split_node ../doc/gforth.texi
 
 doc/gforth.txt:	$(GFORTH_TEXI)
 		-cd doc; $(MAKEINFO) --no-headers --no-split gforth.texi >gforth.txt
 
-doc:		doc/gforth.ps html doc/gforth.txt
+doc:		info doc/gforth.ps html doc/gforth.txt TAGS
 
 # For an explanation of the following Makefile rules, see node
 # `Automatic Remaking' in GNU Autoconf documentation.
-$(srcdir)/configure:	configure.in aclocal.m4
+
+#Note: no target "$(srcdir)/configure", because that does not trigger 
+#unless $(srcdir)!="."
+configure:	configure.in aclocal.m4
 		cd $(srcdir) && autoconf
 
 aclocal.m4:	acinclude.m4 configure.in