--- gforth/Makefile.in	1998/06/04 16:17:36	1.110
+++ gforth/Makefile.in	1998/07/10 22:37:27	1.115
@@ -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)
@@ -68,7 +68,7 @@ FORTHK	= ./gforth $(FORTHKFLAGS)
 FORTHP	= ./gforth --die-on-signal -i ./$(kernel_fi)
 STRIP	= strip
 TEXI2DVI = texi2dvi
-DVI2PS	= dvips -D300
+DVI2PS	= dvips -Z
 #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/
 TEXI2HTML = texi2html
 MAKEINFO = makeinfo
@@ -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 \
@@ -210,6 +209,8 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 COMPAT	= compat/CVS compat/README compat/control.fs compat/anslocal.fs \
 	compat/struct.fs compat/loops.fs
 
+GFORTH_TEXI =  doc/gforth.texi doc/version.texi
+
 ALLSUBDIRS = engine
 
 ARCHS =	arch/generic/machine.h \
@@ -294,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
 
@@ -302,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:
@@ -354,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
@@ -617,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
@@ -635,7 +636,7 @@ checkdoc:	doc/gforth.ds prim.b ds2texi.f
 
 dvi:		doc/gforth.dvi
 
-doc/gforth.dvi doc/gforth.fns:	doc/gforth.texi
+doc/gforth.dvi doc/gforth.fns:	$(GFORTH_TEXI)
 		cd doc; $(TEXI2DVI) gforth.texi
 
 doc/gforth.ps:	doc/gforth.dvi
@@ -643,21 +644,27 @@ doc/gforth.ps:	doc/gforth.dvi
 
 info:		doc/gforth.info
 
-doc/gforth.info doc/gforth.info-*:	doc/gforth.texi
+doc/gforth.info doc/gforth.info-*: $(GFORTH_TEXI)
 		-cd doc; $(MAKEINFO) gforth.texi
 
-html:		doc/gforth.texi
-		-$(RM) html/*
+html:		$(GFORTH_TEXI)
+		-$(RMTREE) html
 		-mkdir html
 		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
 
 # For an explanation of the following Makefile rules, see node
 # `Automatic Remaking' in GNU Autoconf documentation.
-$(srcdir)/configure:	configure.in 
+$(srcdir)/configure:	configure.in aclocal.m4
 		cd $(srcdir) && autoconf
 
+aclocal.m4:	acinclude.m4 configure.in
+		aclocal
+
 # autoheader might not change config.h.in, so touch a stamp file.
 config.h.in:	stamp-h.in
 stamp-h.in:	configure.in  acconfig.h
@@ -668,8 +675,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