--- gforth/Makefile.in	2009/01/25 18:17:05	1.443
+++ gforth/Makefile.in	2009/11/29 19:26:47	1.447
@@ -143,14 +143,14 @@ siteforthdir=$(datadir)/gforth/site-fort
 PROFOBJS = @PROFOBJS@
 PROFEXES = @PROFEXES@
 
-CVSDIRS = CVS engine/CVS kernel/CVS doc/CVS asm/CVS ec/CVS test/CVS \
-	compat/CVS unix/CVS \
-	arch/CVS arch/generic/CVS arch/m68k/CVS arch/mips/CVS \
-	arch/386/CVS arch/hppa/CVS arch/sparc/CVS arch/power/CVS \
-	arch/alpha/CVS arch/4stack/CVS arch/misc/CVS arch/6502/CVS \
-	arch/8086/CVS arch/avr/CVS arch/c165/CVS arch/h8/CVS \
-	arch/shboom/CVS arch/sharc/CVS arch/ia64/CVS arch/amd64/CVS \
-	arch/arm/CVS arch/r8c/CVS
+INSTALLDIRS = kernel doc asm ec test \
+	compat unix \
+	arch arch/generic arch/m68k arch/mips \
+	arch/386 arch/hppa arch/sparc arch/power \
+	arch/alpha arch/4stack arch/misc arch/6502 \
+	arch/8086 arch/avr arch/c165 arch/h8 \
+	arch/shboom arch/sharc arch/ia64 arch/amd64 \
+	arch/arm arch/r8c
 
 INCLUDES = engine/forth.h engine/threaded.h engine/io.h engine/longlong.h
 
@@ -235,6 +235,7 @@ GFORTH_FI_SRC = \
 	locals.fs \
 	look.fs \
 	mkdir.fs \
+	prelude.fs \
 	quotes.fs \
 	search.fs \
 	see.fs \
@@ -281,6 +282,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	test/other.fs test/signals.fs test/checkans.fs \
 	test/primtest.fs test/coreext.fs test/deferred.fs \
 	test/coremore.fs test/gforth-nofast.fs test/libcc.fs \
+	test/macros.fs \
 	bubble.fs siev.fs matrix.fs fib.fs \
 	oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \
 	moofglos.fs fixpath.fs \
@@ -295,6 +297,7 @@ COMPAT = compat/README \
 	compat/exception.fs \
 	compat/execute-parsing.fs \
 	compat/loops.fs \
+	compat/macros.fs \
 	compat/required.fs \
 	compat/strcomp.fs \
 	compat/struct.fs \
@@ -381,7 +384,7 @@ ARCHS_NO_DIST = \
 	arch/h8/asm.fs \
 	arch/r8c/tt.fs
 
-VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \
+VMGEN_EX = vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \
 	vmgen-ex/engine.c vmgen-ex/fib.mini \
 	vmgen-ex/mini-inst.vmg vmgen-ex/mini-super.vmg vmgen-ex/mini.h \
 	vmgen-ex/mini.l vmgen-ex/mini.y vmgen-ex/peephole-blacklist \
@@ -404,7 +407,7 @@ ENGINE_SOURCES = engine/Makefile.in engi
 	engine/fnmatch.h engine/fnmatch.c \
 	engine/makefile.dos engine/makefile.os2
 
-SOURCES	= $(CVSDIRS) $(ENGINE_SOURCES) compat Makefile.in Makedist.in \
+SOURCES	= $(ENGINE_SOURCES) compat Makefile.in Makedist.in \
 	gforthmi.in vmgen.in preforth.in gfgen README.vmgen NEWS.vmgen \
 	autogen.sh configure.in configure config.sub config.guess \
 	elisp-comp missing stamp-h.in envos.fs.in \
@@ -643,10 +646,10 @@ installdirs:	mkinstalldirs
 		for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth/$(VERSION) $(libccdir); do \
 			$(srcdir)/mkinstalldirs $(DESTDIR)$$i; \
 		done
-		for i in $(CVSDIRS); do \
-			$(srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/gforth/$(VERSION)/`dirname $$i`; \
+		#
+		for i in $(INSTALLDIRS); do \
+			$(srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/gforth/$(VERSION)/$$i; \
 		done
-		$(RM) -rf $(DESTDIR)$(datadir)/gforth/$(VERSION)/engine
 
 #deinstall all files specific to this version of gforth
 #to uninstall version foo, type `make uninstall VERSION=foo'
@@ -673,7 +676,7 @@ checkone test: gforth.fi engine/prim-s.i
 		$(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/deferred.fs test/coreext.fs test/search.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out
 		$(FORTH) test/other.fs -e bye
 		$(FORTHS) test/signals.fs -e bye
-		$(FORTHS) test/coremore.fs test/gforth.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/gforth.out
+		$(FORTHS) test/coremore.fs test/gforth.fs test/macros.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/gforth.out
 		$(FORTH) code.fs test/checkans.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/checkans.out
 		$(FORTH) prims2x.fs -e \
 		  "c-flag on s\" prim.i\" out-filename 2! s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \