--- gforth/Makefile.in	1999/02/03 00:10:18	1.146
+++ gforth/Makefile.in	1999/05/09 21:32:02	1.152
@@ -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
@@ -219,7 +219,8 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \
 	test/other.fs test/checkans.fs \
 	bubble.fs siev.fs matrix.fs fib.fs \
-	oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs
+	oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \
+	moofglos.fs
 
 COMPAT = compat/README \
 	compat/anslocal.fs \
@@ -292,7 +293,7 @@ SOURCES	= $(CVSDIRS) compat Makefile.in
 	doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \
 	gforth.el \
 	prim engine/engine.c engine/main.c engine/io.c engine/memcmpc.c \
-	$(ARCHS) \
+	engine/signals.c $(ARCHS) \
 	engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \
 	engine/ecvt.c engine/memcmp.c engine/strtol.c engine/strtoul.c \
 	engine/ansidecl.h engine/memmove.c \
@@ -348,7 +349,7 @@ kernel/version.fs:	version
 	$(MAKE) gforth$(EXE)
 	echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs
 
-more:	engine $(FORTH_GEN) gforth$(EXE)
+more:	engine $(FORTH_GEN) $(GEN)
 
 #from the gcc Makefile: 
 #"Deletion of files made during compilation.
@@ -436,13 +437,14 @@ binonlydist:	Makedist FORCE
 install:	gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi doc/gforth.1 prim install.TAGS installdirs
 		touch $(siteforthdir)/siteinit.fs
 		-$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi
-		-$(RM) $(bindir)/gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) $(bindir)/gforthmi
+		-$(RM) $(bindir)/gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE)
 		$(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE)
-		$(LN_S) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforth$(EXE)
+		(cd $(bindir) && $(LN_S) gforth-$(VERSION)$(EXE) gforth$(EXE))
 		$(INSTALL_PROGRAM) -s gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE)
-		$(LN_S) $(bindir)/gforth-fast-$(VERSION)$(EXE) $(bindir)/gforth-fast$(EXE)
+		(cd $(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) gforth-fast$(EXE))
 		$(INSTALL_PROGRAM) gforthmi $(bindir)/gforthmi-$(VERSION)
-		$(LN_S) $(bindir)/gforthmi-$(VERSION) $(bindir)/gforthmi
+		$(INSTALL_PROGRAM) gforth-ditc $(libdir)/gforth/$(VERSION)
+		(cd $(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi)
 		-$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir)
 		-for i in $(srcdir)/doc/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done
 		for i in $(FORTH_SRC) $(COMPAT) prim; do \
@@ -496,7 +498,7 @@ bench:		gforth-fast$(EXE) gforth.fi
 
 # -------------	Make forth images
 
-# Hot to make new images:
+# How to make new images:
 # 1. Produce an image called kernlXYZ.fi-
 #    the original kernel.fi is not touched because it's needed for creation
 # 2. copy old kernlXYZ.fi to kernlXYZ.fi~
@@ -635,8 +637,8 @@ prim.TAGS: 	prim.b prims2x.fs
 		$(CP) $@- $@
 		$(RM) $@-
 
-doc/doc.fd:	doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs mini-oof.fs
-		$(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs startup.fs code.fs objects.fs oof.fs mini-oof.fs -e bye
+doc/doc.fd:	doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs moofglos.fs
+		$(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs startup.fs code.fs objects.fs oof.fs moofglos.fs -e bye
 
 doc/crossdoc.fd:	$(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
 		$(FORTHK) -e 's" mach32l.fs"' kernel/main.fs -e bye