--- gforth/Makefile.in	2011/11/17 18:45:52	1.464
+++ gforth/Makefile.in	2012/03/19 21:51:38	1.470
@@ -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.
 
@@ -49,8 +49,9 @@ EC = @EC@
 
 # ------------	Install Directories
 
+package =
 VPATH = @srcdir@
-prefix = @prefix@
+prefix = $(package)@prefix@
 exec_prefix = @exec_prefix@
 srcdir = @srcdir@
 bindir = @bindir@
@@ -263,7 +264,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 +277,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 +293,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 +385,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 = \
@@ -600,6 +607,9 @@ bindist:	Makedist FORCE
 binonlydist:	Makedist FORCE
 		$(MAKE) -f Makedist d$@
 
+debdist:	Makedist FORCE
+		$(MAKE) -f Makedist d$@
+
 #HPUX make breaks the cycle differently when the dates are equal, so
 # touch some of the files if it acts up
 hpux-workaround:
@@ -637,7 +647,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); \