--- gforth/Makefile.in	1998/12/22 23:11:29	1.136
+++ gforth/Makefile.in	1999/01/10 22:00:22	1.144
@@ -53,7 +53,7 @@ osclass = @OSCLASS@
 SHELL	= /bin/sh
 RM	= rm
 RMTREE	= rm -rf
-CP	= cp
+CP	= cp -p
 MV	= mv
 TAR	= tar cf -
 INSTALL	= @INSTALL@
@@ -62,10 +62,14 @@ INSTALL_DATA = @INSTALL_DATA@
 LN_S	= @LN_S@
 GCC	= @CC@
 CC	= $(GCC)
-FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(datadir)/gforth/site-forth$(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	= ./gforth --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir)
-FORTHKFLAGS= --die-on-signal -p .$(PATHSEP)$\~+$(PATHSEP)$(srcdir) -i $(kernel_fi)
+FORTH_ARGS = --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir)
+ENGINE = ./gforth
+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)
 STRIP	= strip
@@ -106,6 +110,7 @@ man1dir= $(mandir)/man1
 man1ext= .1
 #older emacses have their site-lisp in $(libdir)/emacs/
 emacssitelispdir=@lispdir@
+siteforthdir=$(datadir)/gforth/site-forth
 
 CVSDIRS = CVS engine/CVS kernel/CVS doc/CVS asm/CVS ec/CVS test/CVS \
 	compat/CVS \
@@ -207,7 +212,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	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 \
-	siteinit.fs table.fs \
+	table.fs \
 	tt.fs sokoban.fs \
 	unbuffered.fs wordsets.fs \
 	test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \
@@ -293,7 +298,7 @@ SOURCES	= $(CVSDIRS) compat Makefile.in
 	engine/pow10.c engine/atanh.c engine/cleanalign.c \
 	engine/strerror.c engine/strsignal.c engine/dblsub.c \
 	INSTALL.DOS makefile.dos engine/makefile.dos mkdosmf.sed config.bat \
-	dosconf.h gforthmi.bat mkinstalldirs \
+	dosconf.h gforthmi.bat mkinstalldirs siteinit.fs \
 	versions.bsh \
 	configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \
 	gforthmi.cmd glosgen.glo doc/glossaries.doc \
@@ -302,7 +307,7 @@ SOURCES	= $(CVSDIRS) compat Makefile.in
 
 RCS_FILES =  ToDo model high-level
 
-GEN = gforth$(EXE) gforth-ditc$(EXE) kernel/version.fs version-stamp
+GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) kernel/version.fs
 
 # things that need a working forth system to be generated
 FORTH_GEN0 = prim.b engine/prim.i engine/prim_lab.i kernel/aliases.fs kernel/prim.fs
@@ -311,14 +316,7 @@ FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ gfor
 FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ 
 
 #distributed documentation
-DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.txt doc/gforth.ps
-
-#stuff in a binonly distribution 
-BINONLYDIST = config.status Makefile Makedist gforth$(EXE) gforth-ditc$(EXE) \
-	$(OBJECTS0) $(OBJECTS) $(OBJECTS_DITC)\
-	arch/$(machine)/machine.h engine/config.h engine/Makefile \
-	stamp-h kernel/version.fs version-stamp \
-	INSTALL.BINDIST
+DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps
 
 KERNLS = kernl16b.fi- kernl16l.fi- \
 	 kernl32b.fi- kernl32l.fi- \
@@ -373,7 +371,8 @@ mostlyclean:	FORCE
 		gforth-$(VERSION).tar.gz
 
 clean:		mostlyclean
-		-$(RM) -rf $(GEN) engine/gforth$(EXE) engine/gforth-ditc$(EXE) \
+		-$(RM) -rf $(GEN) engine/gforth$(EXE) \
+		engine/gforth-fast$(EXE) engine/gforth-ditc$(EXE) \
 		*.o engine/*.o arch/*/*.o version
 
 distclean:	clean
@@ -426,10 +425,12 @@ binonlydist:	Makedist FORCE
 #supplying a lot of files that can be easily generated (only info is
 #hard to generate)
 install:	gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi doc/gforth.1 prim install.TAGS installdirs
-		touch $(datadir)/gforth/site-forth/siteinit.fs
+		touch $(siteforthdir)/siteinit.fs
 		-$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi
 		$(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE)
 		$(LN_S) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforth$(EXE)
+		$(INSTALL_PROGRAM) -s gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE)
+		$(LN_S) $(bindir)/gforth-fast-$(VERSION)$(EXE) $(bindir)/gforth-fast$(EXE)
 		$(INSTALL_PROGRAM) gforthmi $(bindir)/gforthmi-$(VERSION)
 		$(LN_S) $(bindir)/gforthmi-$(VERSION) $(bindir)/gforthmi
 		-$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir)
@@ -439,10 +440,10 @@ install:	gforth$(EXE) $(FORTH_SRC) $(ker
 		done
 		$(INSTALL_DATA) $(kernel_fi) $(datadir)/gforth/$(VERSION)
 		$(RM) gforth.fi
-		GFORTHD="./gforth-ditc -i $(kernel_fi)" GFORTH="./gforth-ditc -i $(kernel_fi) startup.fs" ./gforthmi gforth.fi $(FORTHSIZES) startup.fs #gforth.fi contains some path names
+		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
-		@if test -d $(emacssitelispdir); then \
+		@if test -d "$(emacssitelispdir)"; then \
 			$(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \
 		else \
 			echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \
@@ -453,7 +454,9 @@ install:	gforth$(EXE) $(FORTH_SRC) $(ker
 install-strip:	install
 
 installdirs:	mkinstalldirs
-		$(srcdir)/mkinstalldirs $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(datadir)/gforth/site-forth
+		for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir); do \
+			$(srcdir)/mkinstalldirs $$i; \
+		done
 		for i in $(CVSDIRS); do \
 			$(srcdir)/mkinstalldirs $(datadir)/gforth/$(VERSION)/`dirname $$i`; \
 		done
@@ -474,12 +477,12 @@ check test:	gforth$(EXE) gforth.fi
 		@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
 
-bench:		gforth$(EXE) gforth.fi
+bench:		gforth-fast$(EXE) gforth.fi
 		@echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)'
-		time $(FORTH) siev.fs -e "main bye"
-		time $(FORTH) bubble.fs -e "main bye"
-		time $(FORTH) -m 160000 matrix.fs -e "main bye"
-		time $(FORTH) fib.fs -e "main bye"
+		time $(FORTH_FAST) siev.fs -e "main bye"
+		time $(FORTH_FAST) bubble.fs -e "main bye"
+		time $(FORTH_FAST) -m 160000 matrix.fs -e "main bye"
+		time $(FORTH_FAST) fib.fs -e "main bye"
 
 # -------------	Make forth images
 
@@ -584,12 +587,16 @@ gforth$(EXE):		engines
 		$(CP) engine/$@ $@
 		@GFORTH_EXE@
 
+gforth-fast$(EXE):	engines
+		$(CP) engine/$@ $@
+		@GFORTHFAST_EXE@
+
 gforth-ditc$(EXE):	engines
 		$(CP) engine/$@ $@
 		@GFORTHDITC_EXE@
 
-engines:	FORCE
-		cd engine && $(MAKE) gforth$(EXE) gforth-ditc$(EXE)
+engines:	FORCE engine/Makefile
+		cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-ditc$(EXE)
 
 # ------------- additional C primitives