--- gforth/Makefile.in	1999/05/10 21:10:31	1.154
+++ gforth/Makefile.in	1999/05/17 13:37:53	1.155
@@ -62,7 +62,7 @@ INSTALL_DATA = @INSTALL_DATA@
 LN_S	= @LN_S@
 GCC	= @CC@
 CC	= $(GCC)
-FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(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_ARGS = --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir)
 ENGINE = ./gforth
@@ -123,6 +123,8 @@ CVSDIRS = CVS engine/CVS kernel/CVS doc/
 INCLUDES = engine/forth.h engine/threaded.h engine/io.h
 
 KERN_SRC = \
+	mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \
+	machpc.fs \
 	kernel/aliases0.fs \
 	kernel/aliases.fs \
 	kernel/args.fs \
@@ -211,8 +213,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \
 	glosgen.fs gray.fs \
 	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 \
+	more.fs other.fs prims2x.fs random.fs \
 	table.fs \
 	tt.fs sokoban.fs \
 	unbuffered.fs wordsets.fs \
@@ -509,7 +510,7 @@ bench:		gforth-fast$(EXE) gforth.fi
 #    these are the ones we want to use now
 
 kernl16l.fi-:	$(KERN_SRC) kernel/version.fs mach16l.fs $(FORTH_GEN0)
-		$(FORTHK) -e 's" mach16l.fs"' kernel/main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye"
+		$(FORTHK) -e 's" mach16l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye"
 
 kernl16b.fi-:	$(KERN_SRC) kernel/version.fs mach16b.fs $(FORTH_GEN0)
 		$(FORTHK) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye"