--- gforth/Makefile.in	1998/06/04 17:10:29	1.111
+++ gforth/Makefile.in	1998/07/05 20:49:58	1.113
@@ -60,7 +60,7 @@ INSTALL_DATA = @INSTALL_DATA@
 LN_S	= @LN_S@
 GCC	= @CC@
 CC	= $(GCC)
-FORTHPATH = $(libdir)/gforth/site-forth$(PATHSEP)$(datadir)/gforth/site-forth$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)$(PATHSEP).
+FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(datadir)/gforth/site-forth$(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)$(srcdir) -i ./$(kernel_fi)
@@ -147,7 +147,6 @@ EC_SRC = \
 	asm/generic.fs \
 	asm/target.fs \
 	ec/00-readme \
-	ec/crossdoc.fd \
 	ec/mirror.fs \
 	ec/mirrors.fs \
 	ec/shex.fs \
@@ -296,7 +295,7 @@ DOCDIST = doc/gforth.info doc/gforth.inf
 #stuff in a binonly distribution 
 BINONLYDIST = config.status Makefile gforth gforth-ditc \
 	$(OBJECTS0) $(OBJECTS) $(OBJECTS_DITC)\
-	arch/$(machine)/machine.h engine/config.h \
+	arch/$(machine)/machine.h engine/config.h engine/Makefile \
 	stamp-h kernel/version.fs version-stamp \
 	INSTALL.BINDIST
 
@@ -304,7 +303,7 @@ KERNLS = kernl16b.fi- kernl16l.fi- \
 	 kernl32b.fi- kernl32l.fi- \
 	 kernl64b.fi- kernl64l.fi-
 
-GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) doc/gforth.texi doc/gforth.dvi doc/gforth.ps Makefile configure
+GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) doc/gforth.texi doc/gforth.dvi doc/gforth.ps Makefile engine/Makefile configure
 
 #standards.info recommends this:
 .SUFFIXES:
@@ -356,7 +355,7 @@ clean:		mostlyclean
 
 distclean:	clean
 		-$(RM) config.cache config.log \
-		config.status engine/config.h Makefile stamp-h
+		config.status engine/config.h Makefile engine/Makefile stamp-h
 
 #realclean is useless, but dangerous, so it's commented out
 #realclean:	distclean
@@ -619,8 +618,8 @@ prim.TAGS: 	prim.b prims2x.fs
 		$(CP) $@- $@
 		$(RM) $@-
 
-doc/doc.fd:	doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs
-		$(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs startup.fs code.fs objects.fs oof.fs -e bye
+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/crossdoc.fd:	$(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
 		$(FORTHK) -e 's" mach32l.fs"' kernel/main.fs -e bye
@@ -673,8 +672,12 @@ engine/config.h:	stamp-h
 stamp-h:	config.h.in config.status
 		CONFIG_FILES=$@ CONFIG_HEADERS=engine/config.h ./config.status
 		echo > stamp-h
+
 Makefile:	Makefile.in config.status
 		CONFIG_FILES="$@ engine/$@" CONFIG_HEADERS=engine/config.h ./config.status
+
+engine/Makefile: engine/Makefile.in config.status
+		CONFIG_FILES="$@ engine/$@" CONFIG_HEADERS=engine/config.h ./config.status
      
 config.status:	configure
 		./config.status --recheck