--- gforth/Makefile.in	1998/06/04 17:10:29	1.111
+++ gforth/Makefile.in	1998/07/28 21:04:01	1.117
@@ -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
@@ -84,8 +84,7 @@ CFLAGS	= $(DEBUGFLAG) -I$(srcdir)/engine
 
 #John Wavrik should use -Xlinker -N to get a writable text (executable)
 XLDFLAGS = @LDFLAGS@
-GCCLDFLAGS = @GCCLDFLAGS@
-LDFLAGS	=  $(DEBUGFLAG) $(XLDFLAGS) $(GCCLDFLAGS)
+LDFLAGS	=  $(DEBUGFLAG) $(XLDFLAGS)
 LDLIBS	= @LIBS@
 
 # ------------	Install Directorys
@@ -147,7 +146,6 @@ EC_SRC = \
 	asm/generic.fs \
 	asm/target.fs \
 	ec/00-readme \
-	ec/crossdoc.fd \
 	ec/mirror.fs \
 	ec/mirrors.fs \
 	ec/shex.fs \
@@ -219,8 +217,10 @@ ARCHS =	arch/generic/machine.h \
 	arch/mips/machine.h \
 	arch/386/machine.h \
 	arch/hppa/machine.h \
+	arch/hppa/cache.c \
 	arch/sparc/machine.h \
 	arch/power/machine.h \
+	arch/power/_sync_cache_range.c \
 	arch/alpha/machine.h \
 	arch/4stack/README \
 	arch/4stack/asm.fs \
@@ -296,7 +296,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 +304,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:
@@ -352,11 +352,12 @@ mostlyclean:	FORCE
 		gforth-$(VERSION).tar.gz
 
 clean:		mostlyclean
-		-$(RM) -rf $(GEN) *.o engine/*.o engine/*.a
+		-$(RM) -rf $(GEN) engine/gforth engine/gforth-ditc \
+		*.o engine/*.o arch/*/*.o
 
 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
@@ -586,7 +587,7 @@ kernel/prim.fs:	prim.b prims2x.fs kernel
 
 gforth:		FORCE
 		-$(CP) gforth gforth~
-		cd engine; make gforth; cd ..
+		cd engine && make gforth && cd ..
 		$(CP) engine/$@ $@
 		@GFORTH_EXE@
 
@@ -619,8 +620,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
@@ -649,10 +650,13 @@ doc/gforth.info doc/gforth.info-*: $(GFO
 		-cd doc; $(MAKEINFO) gforth.texi
 
 html:		$(GFORTH_TEXI)
-		-$(RM) html/*
+		-$(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
@@ -673,8 +677,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