--- gforth/Makefile.in	1995/12/26 17:35:34	1.51
+++ gforth/Makefile.in	1996/07/16 20:57:05	1.63
@@ -58,6 +58,7 @@ GCCLDFLAGS = @GCCLDFLAGS@
 LDFLAGS	=  $(DEBUGFLAG) $(XLDFLAGS) $(GCCLDFLAGS)
 LDLIBS	= @LIBS@
 
+VPATH = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 srcdir = @srcdir@
@@ -67,40 +68,81 @@ datadir = $(prefix)/share
 #read-only architecture-dependent non-ascii files
 libdir = $(prefix)/lib
 infodir = $(prefix)/info
-mandir = $(prefix)/man/man1
-
+mandir = $(prefix)/man
+man1dir= $(mandir)/man1
+man1ext= .1
+#older emacses have their site-lisp in $(libdir)/emacs/
+emacssitelispdir=$(datadir)/emacs/site-lisp
 
 INCLUDES = forth.h threading.h io.h io-dos.h config.h
 
-KERN_SRC = main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \
-	errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs
-
-GFORTH_FI_SRC = startup.fs glocals.fs search-order.fs hash.fs float.fs \
-	debugging.fs environ.fs wordinfo.fs look.fs vt100.fs see.fs \
-	bufio.fs debug.fs history.fs vt100key.fs assert.fs source.fs \
-	blocks.fs struct.fs dumpimage.fs
-
-FORTH_SRC = anslocal.fs add.fs assert.fs ansi.fs answords.fs blocks.fs bufio.fs checkans.fs \
-	code.fs colorize.fs cross.fs debug.fs debugging.fs doskey.fs ds2texi.fs \
-	dumpimage.fs environ.fs errore.fs etags.fs extend.fs filedump.fs \
-	float.fs glocals.fs glosgen.fs gray.fs hash.fs history.fs \
-	kernal.fs locals-test.fs look.fs main.fs makedoc.fs \
+KERN_SRC = \
+	add.fs \
+	aliases.fs \
+	cross.fs \
+	errore.fs \
+	extend.fs \
+	kernal.fs \
+	main.fs \
+	search-order.fs \
+	special.fs \
+	tools.fs \
+	toolsext.fs \
+	vars.fs \
+	version.fs
+
+GFORTH_FI_SRC = \
+	assert.fs \
+	blockedit.fb \
+	blocks.fs \
+	bufio.fs \
+	debug.fs \
+	debugging.fs \
+	dumpimage.fs \
+	environ.fs \
+	float.fs \
+	glocals.fs \
+	hash.fs \
+	history.fs \
+	look.fs \
+	search-order.fs \
+	see.fs \
+	source.fs \
+	startup.fs \
+	struct.fs \
+	stuff.fs \
+	tasker.fs \
+	termsize.fs \
+	vt100.fs \
+	vt100key.fs \
+	wordinfo.fs
+
+FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) \
+	ansi.fs answords.fs \
+	checkans.fs \
+	code.fs colorize.fs \
+	doskey.fs ds2texi.fs \
+	etags.fs filedump.fs \
+	glosgen.fs gray.fs \
+	makedoc.fs \
 	mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \
-	other.fs prims2x.fs random.fs search-order.fs see.fs sieve.fs source.fs \
-	startup.fs site-init.fs struct.fs tools.fs toolsext.fs tt.fs vars.fs \
-	vt100.fs vt100key.fs wordinfo.fs wordsets.fs \
-	tester.fs coretest.fs \
+	more.fs other.fs prims2x.fs random.fs \
+	sieve.fs \
+	site-init.fs \
+	tt.fs sokoban.fs \
+	wordsets.fs \
+	tester.fs coretest.fs postponetest.fs dbltest.fs \
 	bubble.fs siev.fs matrix.fs fib.fs
 
-SOURCES	= CVS Makefile.in configure.in configure config.sub config.guess \
+SOURCES	= CVS compat Makefile.in configure.in configure config.sub config.guess \
 	acconfig.h config.h.in \
 	install-sh INSTALL README ToDo BUGS model COPYING Benchres \
 	gforth.ds texinfo.tex gforth.1 gforth.el \
-	primitives engine.c main.c io.c \
+	primitives engine.c main.c io.c memcasecmp.c \
 	m68k.h mips.h 386.h hppa.h cache.c sparc.h power.h alpha.h 32bit.h \
 	getopt.c getopt1.c getopt.h select.c \
 	ecvt.c memcmp.c strtol.c strtoul.c ansidecl.h memmove.c pow10.c \
-	strerror.c strsignal.c \
+	strerror.c strsignal.c dblsub.c \
 	INSTALL.DOS makefile.dos mkdosmf.sed configure.bat \
 	startup.dos history.dos \
 	glosgen.glo glossaries.doc \
@@ -110,7 +152,7 @@ RCS_FILES =  ToDo model high-level
 
 GEN = gforth version.fs
 
-OBJECTS	= engine.o io.o main.o @LIBOBJS@ @getopt_long@
+OBJECTS	= engine.o io.o main.o memcasecmp.o @LIBOBJS@ @getopt_long@
 
 # things that need a working forth system to be generated
 FORTH_GEN0 = primitives.b primitives.i prim_labels.i aliases.fs
@@ -165,13 +207,14 @@ clean:		mostlyclean
 distclean:	clean
 		-$(RM) machine.h kernal.fi config.cache config.log config.status config.h Makefile
 
-realclean:	distclean
-		-$(RM) $(GEN_PRECIOUS)
+#realclean is useless, but dangerous, so it's commented out
+#realclean:	distclean
+#		-$(RM) $(GEN_PRECIOUS)
 
 #mostlyclean, but also remove some of the stuff that is distributed
 virtualclean:	mostlyclean
 		-$(RM) -rf gforth.fns gforth.texi gforth.ps gforth.info* \
-		gforth-$(VERSION).tar.gz config.cache *~ *TAGS
+		gforth-$(VERSION).tar.gz config.cache *~ */*~
 
 dist:		$(SOURCES) $(FORTH_GEN) $(DOCDIST)
 		-rm -rf gforth-$(VERSION)
@@ -224,7 +267,12 @@ install:	gforth $(FORTH_SRC) kernal.fi g
 		done
 		$(INSTALL_DATA) kernal.fi $(libdir)/gforth/$(VERSION)
 		$(FORTHK) startup.fs dumpimage.fs -e "savesystem $(libdir)/gforth/$(VERSION)/gforth.fi bye" #gforth.fi contains some path names
-		sed s:$(srcdir)/:$(datadir)/gforth/$(VERSION): gforth.TAGS >TAGS; $(INSTALL_DATA) TAGS $(datadir)/gforth/$(VERSION)
+		sed s:$(srcdir)/:$(datadir)/gforth/$(VERSION)/: gforth.TAGS >TAGS; $(INSTALL_DATA) TAGS $(datadir)/gforth/$(VERSION)
+		if test -d $(emacssitelispdir); then \
+			$(INSTALL_DATA) gforth.el $(emacssitelispdir); \
+		else \
+			echo "please install gforth.el in your .../emacs/site-lisp directory"; \
+		fi
 
 #deinstall all files specific to this version of gforth
 #to uninstall version foo, type `make uninstall VERSION=foo'
@@ -236,7 +284,7 @@ check:		test
 		touch test
 
 test:		gforth gforth.fi
-		$(FORTH) tester.fs coretest.fs -e bye
+		$(FORTH) tester.fs coretest.fs postponetest.fs dbltest.fs -e bye
 		$(FORTH) code.fs checkans.fs -e bye
 		@echo 'Expect no differences'
 		$(FORTH) prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye"| diff -c - primitives.i
@@ -256,22 +304,22 @@ gforth:		$(OBJECTS)
 		@MAKE_EXE@
 
 kernl16l.fi-:	$(KERN_SRC) mach16l.fs $(FORTH_GEN0)
-		$(FORTHK) -p . -e 's" mach16l.fs"' main.fs
+		$(FORTHK) -p . -e 's" mach16l.fs"' main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye"
 
 kernl16b.fi-:	$(KERN_SRC) mach16b.fs $(FORTH_GEN0)
-		$(FORTHK) -p . -e 's" mach16b.fs"' main.fs
+		$(FORTHK) -p . -e 's" mach16b.fs"' main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye"
 
 kernl32l.fi-:	$(KERN_SRC) mach32l.fs $(FORTH_GEN0)
-		$(FORTHK) -p . -e 's" mach32l.fs"' main.fs
+		$(FORTHK) -p . -e 's" mach32l.fs"' main.fs -e "save-cross kernl32l.fi- $(bindir)/gforth-$(VERSION) bye"
 
 kernl32b.fi-:	$(KERN_SRC) mach32b.fs $(FORTH_GEN0)
-		$(FORTHK) -p . -e 's" mach32b.fs"' main.fs
+		$(FORTHK) -p . -e 's" mach32b.fs"' main.fs -e "save-cross kernl32b.fi- $(bindir)/gforth-$(VERSION) bye"
 
 kernl64l.fi-:	$(KERN_SRC) mach64l.fs $(FORTH_GEN0)
-		$(FORTHK) -p . -e 's" mach64l.fs"' main.fs
+		$(FORTHK) -p . -e 's" mach64l.fs"' main.fs -e "save-cross kernl64l.fi- $(bindir)/gforth-$(VERSION) bye"
 
 kernl64b.fi-:	$(KERN_SRC) mach64b.fs $(FORTH_GEN0)
-		$(FORTHK) -p . -e 's" mach64b.fs"' main.fs
+		$(FORTHK) -p . -e 's" mach64b.fs"' main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye"
 
 kernl16b.fi:	$(KERNLS)
 		-$(CP) kernl16b.fi kernl16b.fi~
@@ -304,10 +352,10 @@ kernl64l.fi:	$(KERNLS)
 		@LINK_KERNL64L@
 
 gforth.fi:	@kernal_fi@ gforth $(GFORTH_FI_SRC)
-		$(FORTHK) startup.fs -e "savesystem gforth.fi bye"
+		$(FORTHK) -p . startup.fs -e "savesystem gforth.fi bye"
 
 gforth.TAGS:	@kernal_fi@ gforth $(GFORTH_FI_SRC) primitives.TAGS
-		$(FORTHK) etags.fs startup.fs -e bye
+		$(FORTHK) -p . etags.fs startup.fs -e bye
 		cat TAGS primitives.TAGS kernal.TAGS >gforth.TAGS
 
 engine.s:	engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES)
@@ -346,7 +394,7 @@ doc.fd:		makedoc.fs float.fs search-orde
 		$(FORTHK) -p . -e "s\" doc.fd\"" makedoc.fs startup.fs code.fs -e bye
 
 crossdoc.fd:	$(KERN_SRC) $(FORTH_GEN0)
-		$(FORTHK) -p . -e 's" mach32l.fs"' main.fs
+		$(FORTHK) -p . -e 's" mach32l.fs"' main.fs -e bye
 
 gforth.texi:	gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd
 		$(FORTHK) -p . ds2texi.fs -e "s\" gforth.ds\" r/o open-file throw ds2texi bye" >$@
@@ -368,6 +416,8 @@ html:		gforth.texi
 		-mkdir html
 		cd html; $(TEXI2HTML) -menu -split_node ../gforth.texi
 
+doc:		gforth.ps html
+
 # For an explanation of the following Makefile rules, see node
 # `Automatic Remaking' in GNU Autoconf documentation.
 ${srcdir}/configure: configure.in