--- gforth/Makefile.in	2000/07/15 19:58:46	1.180
+++ gforth/Makefile.in	2000/07/23 19:29:55	1.181
@@ -31,7 +31,7 @@
 # ------------- gforth version
 
 VERSION	= @VERSION@
-DOSVERSION=`echo $(VERSION)|sed 's/\.//g'`
+DOSVERSION=`echo $(VERSION)|sed 's/\.//g'|sed 's/-.*//g'`
 
 # -------------	System specific variables	
 
@@ -175,7 +175,7 @@ EC_SRC = \
 
 GFORTH_FI_SRC = \
 	assert.fs \
-	backtrace.fs \
+	backtrac.fs \
 	blocked.fb \
 	blocks.fs \
 	bufio.fs \
@@ -186,7 +186,7 @@ GFORTH_FI_SRC = \
 	environ.fs \
 	errors.fs \
 	exboot.fs \
-	exceptions.fs \
+	except.fs \
 	extend.fs \
 	float.fs \
 	glocals.fs \
@@ -221,7 +221,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	more.fs other.fs prims2x.fs random.fs \
 	table.fs string.fs \
 	tt.fs sokoban.fs \
-	unbuffered.fs wordsets.fs \
+	unbuffer.fs wordsets.fs \
 	test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \
 	test/other.fs test/checkans.fs \
 	bubble.fs siev.fs matrix.fs fib.fs \
@@ -644,8 +644,8 @@ TAGS:		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 exceptions.fs startup.fs -e bye
+gforth.TAGS:	@kernel_fi@ gforth$(EXE) $(GFORTH_FI_SRC) prim.TAGS
+		$(FORTHK) etags.fs except.fs startup.fs -e bye
 		cat TAGS prim.TAGS kernel.TAGS >gforth.TAGS
 		rm TAGS
 
@@ -655,7 +655,7 @@ prim.TAGS: 	prim.b prims2x.fs
 		$(RM) $@-
 
 doc/doc.fd:	doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs moofglos.fs
-		$(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs exceptions.fs startup.fs code.fs objects.fs oof.fs moofglos.fs -e bye
+		$(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs except.fs startup.fs code.fs objects.fs oof.fs moofglos.fs -e bye
 
 doc/crossdoc.fd:	$(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
 		$(FORTHK) -e 's" mach32l.fs"' kernel/main.fs -e bye