--- gforth/Makefile.in	1995/12/26 17:35:34	1.51
+++ gforth/Makefile.in	1996/01/07 17:22:06	1.52
@@ -58,6 +58,7 @@ GCCLDFLAGS = @GCCLDFLAGS@
 LDFLAGS	=  $(DEBUGFLAG) $(XLDFLAGS) $(GCCLDFLAGS)
 LDLIBS	= @LIBS@
 
+VPATH = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 srcdir = @srcdir@
@@ -67,28 +68,66 @@ 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 \
+	tools.fs \
+	toolsext.fs \
+	vars.fs \
+	version.fs
+
+GFORTH_FI_SRC = \
+	assert.fs \
+	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 \
+	termsize.fs \
+	vt100.fs \
+	vt100key.fs \
+	wordinfo.fs
+
+FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) \
+	anslocal.fs 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 \
+	more.fs other.fs prims2x.fs random.fs \
+	sieve.fs \
+	site-init.fs \
+	tt.fs sokoban.fs \
+	wordsets.fs \
 	tester.fs coretest.fs \
 	bubble.fs siev.fs matrix.fs fib.fs
 
@@ -225,6 +264,11 @@ install:	gforth $(FORTH_SRC) kernal.fi g
 		$(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)
+		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'