--- gforth/Makefile.in	2011/11/16 23:15:05	1.463
+++ gforth/Makefile.in	2012/03/14 15:51:15	1.469
@@ -1,6 +1,6 @@
 #Makefile for Gforth
 
-#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc.
+#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009,2010,2011 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -109,7 +109,7 @@ FORTHB = $(BUILDFORTH) exboot.fs -e 'fpa
 ENGINE_FAST = ./gforth-fast
 FORTH_FAST	= $(ENGINE_FAST) $(FORTH_ARGS)
 FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)
-FORTHK	= ./kforth -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)"
+FORTHK	= ./gforthker -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)"
 #FORTHP	= $(ENGINE) --die-on-signal -i ./$(kernel_fi)
 #the "-2 image-included-files +!" undoes the change to image-included-files
 # in exboot.fs
@@ -263,7 +263,8 @@ GFORTH_FI_SRC2=\
 	arch/arm/testdisasm.fs arch/arm/testdisasm.out arch/arm/Makefile \
 	arch/mips/asm.fs arch/mips/disasm.fs arch/mips/insts.fs \
 	arch/mips/testasm.fs arch/mips/testdisasm.fs \
-	arch/power/asm.fs arch/power/disasm.fs arch/power/inst.fs
+	arch/power/asm.fs arch/power/disasm.fs arch/power/inst.fs \
+	arch/lm32/asm.fs arch/lm32/testasm.fs
 
 # execlude envos.fs into list of distributed sources
 GFORTH_FI_DIST_SRC = \
@@ -275,7 +276,7 @@ GFORTH_FI_SRC = \
 	envos.fs \
 	$(GFORTH_FI_SRC2)
 
-LIBCC_SRC = cstr.fs unix/socket.fs
+LIBCC_SRC = cstr.fs unix/socket.fs unix/pthread.fs
 
 LIBCC_DIST_SRC = libffi.fs fflib.fs $(LIBCC_SRC)
 
@@ -291,7 +292,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_DIST
 	make-app.fs doc/makedoc.fs locate.fs more.fs onebench.fs \
 	other.fs prims2x.fs prims2x0.6.2.fs proxy.fs random.fs \
 	regexp.fs sokoban.fs string.fs table.fs tags.fs \
-	tt.fs \
+	tt.fs quotations.fs \
 	unbuffer.fs wordsets.fs xwords.fs \
 	test/tester.fs test/ttester.fs \
 	test/coretest.fs test/postpone.fs test/dbltest.fs \
@@ -383,7 +384,12 @@ ARCHS =	\
 	arch/r8c/lauflicht.fs \
 	arch/r8c/tasker.fs \
 	arch/r8c/terminal.fs \
-	arch/sharc/unistd.h
+	arch/sharc/unistd.h \
+	arch/lm32/mach.fs \
+	arch/lm32/mach.sh \
+	arch/lm32/prim.fs \
+	arch/lm32/Makefile \
+	arch/lm32/testasm.disas-ok
 
 #not included in distribution until distribution terms are included:
 ARCHS_NO_DIST = \
@@ -426,7 +432,7 @@ ENGINE_SOURCES = engine/Makefile.in engi
 	engine/makefile.dos engine/makefile.os2
 
 SOURCES	= $(ENGINE_SOURCES) compat Makefile.in Makedist.in \
-	gforthmi.in vmgen.in preforth.in gfgen README.vmgen NEWS.vmgen \
+	gforthmi.in vmgen.in preforth.in gforthker.in gfgen README.vmgen NEWS.vmgen \
 	autogen.sh configure.in configure config.sub config.guess \
 	elisp-comp missing stamp-h.in envos.fs.in \
 	iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \
@@ -637,7 +643,7 @@ install:	gforth$(EC)$(EXE) $(FORTH_SRC)
 		for i in $(FORTH_SRC) $(COMPAT) envos.fs prim; do \
 			$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/gforth/$(VERSION)/$$i; \
 		done
-		$(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(datadir)/gforth/$(VERSION)
+		$(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(libdir)/gforth/$(VERSION)
 		@if test -d "$(DESTDIR)$(emacssitelispdir)"; then \
 			for i in gforth.el @gforth_elc@; do \
 				$(INSTALL_DATA) $$i $(DESTDIR)$(emacssitelispdir); \