--- gforth/Makefile.in	1998/11/24 14:49:11	1.126
+++ gforth/Makefile.in	1998/12/19 23:15:07	1.131
@@ -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@
@@ -214,8 +215,16 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	bubble.fs siev.fs matrix.fs fib.fs \
 	oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs
 
-COMPAT	= compat/README compat/control.fs compat/anslocal.fs \
-	compat/struct.fs compat/loops.fs
+COMPAT = compat/README \
+	compat/anslocal.fs \
+	compat/assert.fs \
+	compat/control.fs \
+	compat/defer.fs \
+	compat/exception.fs \
+	compat/loops.fs \
+	compat/required.fs \
+	compat/struct.fs \
+	compat/vocabulary.fs
 
 GFORTH_TEXI =  doc/gforth.texi doc/version.texi
 
@@ -269,7 +278,7 @@ ARCHS =	\
 	arch/shboom/sh.p \
 	arch/shboom/doers.fs
 
-SOURCES	= $(CVSDIRS) compat Makefile.in engine/Makefile.in gforthmi \
+SOURCES	= $(CVSDIRS) compat Makefile.in engine/Makefile.in gforthmi.in \
 	configure.in configure config.sub config.guess elisp-comp missing \
 	acconfig.h acinclude.m4 engine/config.h.in stamp-h.in \
 	install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS model \
@@ -278,12 +287,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 +347,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)
 
@@ -372,7 +380,7 @@ distclean:	clean
 		-$(RM) config.cache config.log config.status \
 		engine/config.h Makefile engine/Makefile \
 		stamp-h engine/stamp-h \
-		doc/version.texi
+		doc/version.texi gforthmi
 
 #realclean is useless, but dangerous, so it's commented out
 #realclean:	distclean
@@ -398,6 +406,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)
 
@@ -459,20 +471,22 @@ binonlydist:	$(SOURCES) $(FORTH_GEN0) @K
 #install does not depend on gforth.info, because that would require
 #supplying a lot of files that can be easily generated (only info is
 #hard to generate)
-install:	gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi doc/gforth.1 prim gforth.TAGS installdirs
+install:	gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi doc/gforth.1 prim install.TAGS installdirs
 		touch $(datadir)/gforth/site-forth/siteinit.fs
 		-$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE)
-		$(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)
-		ln $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE)
+		$(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE)
+		$(LN_S) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforth$(EXE)
+		$(INSTALL_PROGRAM) gforthmi $(bindir)/gforthmi-$(VERSION)
+		$(LN_S) $(bindir)/gforthmi-$(VERSION) $(bindir)/gforthmi
 		-$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir)
-		-for i in $(srcdir)/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done
-		for i in $(FORTH_SRC) prim; do \
-			$(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION); \
+		-for i in $(srcdir)/doc/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done
+		for i in $(FORTH_SRC) $(COMPAT) prim; do \
+			$(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION)/$$i; \
 		done
 		$(INSTALL_DATA) $(kernel_fi) $(datadir)/gforth/$(VERSION)
 		$(RM) gforth.fi; $(MAKE) gforth.fi #gforth.fi contains some path names
 		$(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)
-		sed 's:^$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >TAGS; $(INSTALL_DATA) TAGS $(datadir)/gforth/$(VERSION)
+		$(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS
 		@if test -d $(emacssitelispdir); then \
 			$(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \
 		else \
@@ -485,16 +499,22 @@ install-strip:	install
 
 installdirs:	mkinstalldirs
 		$(srcdir)/mkinstalldirs $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(datadir)/gforth/site-forth
+		for i in $(CVSDIRS); do \
+			$(srcdir)/mkinstalldirs $(datadir)/gforth/$(VERSION)/`dirname $$i`; \
+		done
+		$(RM) -rf $(datadir)/gforth/$(VERSION)/arch $(datadir)/gforth/$(VERSION)/engine
 
 #deinstall all files specific to this version of gforth
 #to uninstall version foo, type `make uninstall VERSION=foo'
 uninstall:	FORCE
-		-$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)
-		@echo -e "Type\n$(RM) -rf $(bindir)/gforth $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth\nto remove Gforth completely"
+		-$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi-$(VERSION)
+		@echo -e "To remove Gforth completely, type\n$(RM) -rf $(bindir)/gforth$(EXE) $(bindir)/gforthmi $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth"
 
 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
@@ -575,7 +595,7 @@ kernl64l.fi:	$(KERNLS)
 #		-$(CP) $< $@
 
 gforth.fi:	$(kernel_fi) gforthmi gforth$(EXE) gforth-ditc$(EXE) $(GFORTH_FI_SRC)
-		GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) startup.fs" $(srcdir)/gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs
+		GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) startup.fs" ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs
 
 # -------------	Make c-engine
 
@@ -604,17 +624,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
@@ -629,6 +650,9 @@ gforth-ditc$(EXE):	FORCE
 TAGS:		gforth.TAGS
 		$(CP) gforth.TAGS $@
 
+install.TAGS:	gforth.TAGS
+		sed 's:^\$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >install.TAGS
+
 gforth.TAGS:	@kernel_fi@ gforth $(GFORTH_FI_SRC) prim.TAGS
 		$(FORTHK) etags.fs startup.fs -e bye
 		cat TAGS prim.TAGS kernel.TAGS >gforth.TAGS
@@ -700,6 +724,9 @@ stamp-h:	engine/config.h.in config.statu
 Makefile:	Makefile.in engine/Makefile.in config.status
 		CONFIG_FILES="$@ engine/$@" CONFIG_HEADERS=engine/config.h ./config.status
 
+gforthmi:	gforthmi.in config.status
+		CONFIG_FILES="$@" CONFIG_HEADERS=engine/config.h ./config.status
+
 config.status:	configure
 		./config.status --recheck