--- gforth/Makefile.in	1995/03/20 18:16:19	1.22
+++ gforth/Makefile.in	1995/07/25 15:28:02	1.29
@@ -16,6 +16,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 LN_S	= @LN_S@
 GCC	= gcc
+CC	= $(GCC)
 FORTH	= ./gforth
 STRIP	= strip
 TEXI2DVI = tex
@@ -27,7 +28,7 @@ XCFLAGS	= @CFLAGS@
 XDEFINES = @DEFS@
 SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions
 ENGINE_FLAGS =  -fno-defer-pop -fcaller-saves
-CFLAGS	= @DEBUGFLAG@ -O4 -Wall $(SWITCHES)
+CFLAGS	= @DEBUGFLAG@ -pipe -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(datadir)/gforth/$(VERSION):$(libdir)/gforth/$(VERSION):.\"
 
 #John Wavrik should use -Xlinker -N to get a writable text (executable)
 LDFLAGS	=  @DEBUGFLAG@ @LDFLAGS@ @GCCLDFLAGS@
@@ -60,11 +61,12 @@ FORTH_SRC = anslocal.fs add.fs assert.fs
 
 SOURCES	= Makefile.in configure.in configure config.sub  config.guess \
 	install-sh INSTALL README ToDo BUGS model COPYING \
-	gforth.ds texinfo.tex gforth.1 \
+	gforth.ds texinfo.tex gforth.1 gforth.el \
 	primitives engine.c main.c io.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 \
+	ecvt.c memcmp.c strtol.c strtoul.c ansidecl.h memmove.c pow10.c \
+	strerror.c \
 	makefile.dos configure.bat startup.dos \
 	glosgen.glo glossaries.doc \
 	$(INCLUDES) $(FORTH_SRC)
@@ -152,14 +154,16 @@ binonlydist:	$(SOURCES) $(FORTH_GEN) gfo
 # gforth manages to execute more than a few primitives
 
 install:	gforth $(FORTH_SRC) gforth.fi gforth.1 gforth.info
-		$(INSTALL) -d $(bindir) $(mandir) $(infodir) $(libdir)/gforth $(datadir)/gforth	
+		$(INSTALL) -d $(bindir) $(mandir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION)	
 		$(INSTALL_PROGRAM) -s gforth $(bindir)
 		$(INSTALL_DATA) gforth.1 $(mandir)
 		$(INSTALL_DATA) gforth.info* $(infodir)
-		$(INSTALL_DATA) gforth.fi $(libdir)/gforth
+		$(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)
 		for i in $(FORTH_SRC); do \
-			$(INSTALL_DATA) $$i $(libdir)/gforth; \
+			$(INSTALL_DATA) $$i $(datadir)/gforth/$(VERSION); \
 		done
+
+check:		test
 		
 test:		gforth
 		@echo 'Expect to see INCORRECT RESULT: { GS1 -> <TRUE> <TRUE> }'
@@ -177,42 +181,42 @@ gforth:		$(OBJECTS)
 		@MAKE_EXE@
 
 kernl16l.fi:	main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \
-		errore.fs kernal.fs extend.fs tools.fs toolsext.fs \
+		errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs \
 		mach16l.fs $(FORTH_GEN1)
 		-$(CP) kernl16l.fi kernl16l.fi~
 		$(FORTH) -e 's" mach16l.fs"' main.fs
 		@LINK_KERNL16L@
 
 kernl16b.fi:	main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \
-		errore.fs kernal.fs extend.fs tools.fs toolsext.fs \
+		errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs \
 		mach16b.fs $(FORTH_GEN1)
 		-$(CP) kernl16b.fi kernl16b.fi~
 		$(FORTH) -e 's" mach16b.fs"' main.fs
 		@LINK_KERNL16B@
 
 kernl32l.fi:	main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \
-		errore.fs kernal.fs extend.fs tools.fs toolsext.fs \
+		errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs \
 		mach32l.fs $(FORTH_GEN1)
 		-$(CP) kernl32l.fi kernl32l.fi~
 		$(FORTH) -e 's" mach32l.fs"' main.fs
 		@LINK_KERNL32L@
 
 kernl32b.fi:	main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \
-		errore.fs kernal.fs extend.fs tools.fs toolsext.fs \
+		errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs \
 		mach32b.fs $(FORTH_GEN1)
 		-$(CP) kernl32b.fi kernl32b.fi~
 		$(FORTH) -e 's" mach32b.fs"' main.fs
 		@LINK_KERNL32B@
 
 kernl64l.fi:	main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \
-		errore.fs kernal.fs extend.fs tools.fs toolsext.fs \
+		errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs \
 		mach64l.fs $(FORTH_GEN1)
 		-$(CP) kernl64l.fi kernl64l.fi~
 		$(FORTH) -e 's" mach64l.fs"' main.fs
 		@LINK_KERNL64L@
 
 kernl64b.fi:	main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \
-		errore.fs kernal.fs extend.fs tools.fs toolsext.fs \
+		errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs \
 		mach64b.fs $(FORTH_GEN1)
 		-$(CP) kernl64b.fi kernl64b.fi~
 		$(FORTH) -e 's" mach64b.fs"' main.fs
@@ -241,13 +245,20 @@ aliases.fs:	primitives.b prims2x.fs
 primitives.fs:	primitives.b prims2x.fs
 		$(FORTH) prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >$@
 
-doc.fs:		makedoc.fs float.fs search-order.fs glocals.fs environ.fs \
+version.fs:	Makefile.in
+		echo ": version-string s\" $(VERSION)\" ;" >$@
+
+version.c:	Makefile.in
+		echo "char gforth_version[]=\"$(VERSION)\" ;" >$@
+
+
+doc.fd:		makedoc.fs float.fs search-order.fs glocals.fs environ.fs \
 		 toolsext.fs wordinfo.fs \
 		 vt100.fs colorize.fs see.fs bufio.fs debug.fs history.fs \
 		 doskey.fs vt100key.fs startup.fs assert.fs debugging.fs
-		$(FORTH) -e "s\" doc.fs\"" makedoc.fs startup.fs -e bye
+		$(FORTH) -e "s\" doc.fd\"" makedoc.fs startup.fs -e bye
 
-gforth.texi:	gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fs
+gforth.texi:	gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd
 		$(FORTH) ds2texi.fs >$@
 
 gforth.dvi:	gforth.texi