--- gforth/Makefile.in	1998/11/24 14:49:11	1.126
+++ gforth/Makefile.in	1998/12/13 23:29:58	1.130
@@ -1,6 +1,6 @@
 #Makefile for Gforth
 
-#Copyright (C) 1995-1997 Free Software Foundation, Inc.
+#Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -31,7 +31,7 @@
 # ------------- gforth version
 
 VERSION	= @VERSION@
-DOSVERSION=`echo $VERSION|sed 's/\.//g'`
+DOSVERSION=`echo $(VERSION)|sed 's/\.//g'`
 
 # -------------	System specific variables	
 
@@ -54,6 +54,7 @@ SHELL	= /bin/sh
 RM	= rm
 RMTREE	= rm -rf
 CP	= cp
+MV	= mv
 TAR	= tar cf -
 INSTALL	= @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -278,12 +279,11 @@ SOURCES	= $(CVSDIRS) compat Makefile.in
 	gforth.el \
 	prim engine/engine.c engine/main.c engine/io.c engine/memcmpc.c \
 	$(ARCHS) \
-	engine/32bit.h \
 	engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \
 	engine/ecvt.c engine/memcmp.c engine/strtol.c engine/strtoul.c \
 	engine/ansidecl.h engine/memmove.c \
 	engine/pow10.c engine/atanh.c engine/cleanalign.c \
-	engine/strerror.c engine/strsignal.c engine/strsig.c engine/dblsub.c \
+	engine/strerror.c engine/strsignal.c engine/dblsub.c \
 	INSTALL.DOS makefile.dos engine/makefile.dos mkdosmf.sed config.bat \
 	dosconf.h gforthmi.bat mkinstalldirs \
 	versions.bsh \
@@ -339,7 +339,7 @@ version:	Makefile.in
 
 kernel/version.fs:	version
 	$(MAKE) gforth$(EXE)
-	$(SHELL) versions.bsh $(VERSION)
+	echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs
 
 more:	engine $(FORTH_GEN) gforth$(EXE)
 
@@ -398,6 +398,10 @@ dosdist:	$(SOURCES) $(FORTH_GEN0) @KERNE
 		mkdir gforth.$(DOSVERSION)
 		$(TAR) $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) | \
 			(cd gforth.$(DOSVERSION); tar xf -)
+		$(MV) gforth.$(DOSVERSION)/engine/strsignal.c gforth.$(DOSVERSION)/engine/strsig.c
+		for i in 1 2 3 4 5 6 7 8; do \
+			$(MV) gforth.$(DOSVERSION)/doc/gforth.info-$$i gforth.$(DOSVERSION)/doc/gforth.i$$i; \
+		done
 		zip -r9 gf$(DOSVERSION)dos.zip gforth.$(DOSVERSION)/*
 		-$(RMTREE) gforth.$(DOSVERSION)
 
@@ -495,6 +499,8 @@ uninstall:	FORCE
 check test:	gforth$(EXE) gforth.fi
 		$(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs -e bye
 		$(FORTH) test/other.fs -e bye
+		@echo "Expect 'Missing: EKEY EKEY>CHAR EKEY? EMIT?'"
+		@echo "Expect 'Missing: EDITOR FORGET'"
 		$(FORTH) code.fs test/checkans.fs -e bye
 		@echo 'Expect no differences'
 		$(FORTHK) -m 100000 prims2x.fs -e "s\" $(srcdir)/prim.b\"' output-c process-file bye"| diff -c - $(srcdir)/engine/prim.i
@@ -604,17 +610,18 @@ kernel/prim.fs:	prim.b prims2x.fs kernel
 		$(CP) $@- $@
 		$(RM) $@-
 
-gforth$(EXE):		FORCE
+gforth$(EXE):		engines
 		-$(CP) gforth$(EXE) gforth~
-		cd engine && $(MAKE) gforth$(EXE)
 		$(CP) engine/$@ $@
 		@GFORTH_EXE@
 
-gforth-ditc$(EXE):	FORCE
-		cd engine && $(MAKE) gforth-ditc$(EXE)
+gforth-ditc$(EXE):	engines
 		$(CP) engine/$@ $@
 		@GFORTHDITC_EXE@
 
+engines:	FORCE
+		cd engine && $(MAKE) gforth$(EXE) gforth-ditc$(EXE)
+
 # ------------- additional C primitives
 
 %.c:		%.pri prim2cl.fs