--- gforth/Makefile.in	2011/01/15 15:31:39	1.457
+++ gforth/Makefile.in	2012/03/19 22:36:01	1.472
@@ -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,25 +49,26 @@ EC = @EC@
 
 # ------------	Install Directories
 
+package =
 VPATH = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 srcdir = @srcdir@
-bindir = @bindir@
+bindir = $(package)@bindir@
 #read-only architecture-independent files
-datarootdir = @datarootdir@
-datadir = @datadir@
+datarootdir = $(package)@datarootdir@
+datadir = $(package)@datadir@
 #read-only architecture-dependent non-ascii files
-libdir = @libdir@
+libdir = $(package)@libdir@
 libccdir = $(subst $(DESTDIR),,$(libdir)/gforth/$(VERSION)/libcc-named/)
-includedir = @includedir@
-infodir = @infodir@
-htmldir = @htmldir@
-mandir = @mandir@
+includedir = $(package)@includedir@
+infodir = $(package)@infodir@
+htmldir = $(package)@htmldir@
+mandir = $(package)@mandir@
 man1dir= $(mandir)/man1
 man1ext= .1
 #older emacses have their site-lisp in $(libdir)/emacs/
-emacssitelispdir=@lispdir@
+emacssitelispdir=$(package)@lispdir@
 siteforthdir=$(datadir)/gforth/site-forth
 
 # -------------	Utility programs
@@ -109,7 +110,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	= $(ENGINE) $(FORTHKFLAGS)
+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
@@ -181,6 +182,7 @@ KERN_SRC = \
 	kernel/basics.fs \
 	kernel/int.fs \
 	kernel/comp.fs \
+	kernel/recognizer.fs \
 	kernel/io.fs \
 	kernel/input.fs \
 	kernel/license.fs \
@@ -245,6 +247,7 @@ GFORTH_FI_SRC2=\
 	simp-see.fs \
 	source.fs \
 	startup.fs \
+	str-exec.fs \
 	struct.fs \
 	struct0x.fs \
 	stuff.fs \
@@ -261,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 = \
@@ -273,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)
 
@@ -289,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 \
@@ -381,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 = \
@@ -424,7 +433,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 \
@@ -464,7 +473,7 @@ FORTH_GEN_ENGINE_FAST= \
 	engine/costs-fast.i engine/super2-fast.i
 FORTH_GEN_PRIMB = $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs
 FORTH_GEN0 = prim.b $(FORTH_GEN_PRIMB)
-FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ @NO_EC@ gforth.fi
+FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ @NO_CROSS@ gforth.fi
 # this is used for antidependences,
 FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ build-ec
 
@@ -493,7 +502,7 @@ GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \
 .SUFFIXES:
 .SUFFIXES: .c .o
 
-all: kernel/version.fs more @NO_EC@ check
+all: kernel/version.fs more @NO_CROSS@ check
 
 # use this dependency for phony targets just as mostlyclean,...
 FORCE: ;
@@ -598,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:
@@ -635,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); \
@@ -690,7 +702,7 @@ check:		gforths	gforth.fi
 		./gforth-fast --diag -e bye
 
 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/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>/dev/null | 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 test/macros.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/gforth.out
@@ -843,7 +855,7 @@ gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCE
 		$(CP) engine/$@ $@ && \
 		$(MASSAGE_EXE) $@; \
 		@GFORTH_EXE@; \
-		@NO_EC@ $(MAKE) checkone check-nofast ENGINE=./engine/$@; \
+		@NO_CROSS@ $(MAKE) checkone check-nofast ENGINE=./engine/$@; \
 	fi
 
 optgforth:
@@ -857,7 +869,7 @@ gforth-fast$(OPT)$(EC)$(EXE): $(ENGINE_S
 		$(CP) engine/$@ $@ && \
 		$(MASSAGE_EXE) $@; \
 		@GFORTHFAST_EXE@; \
-		@NO_EC@ $(MAKE) checkone ENGINE=./engine/$@; \
+		@NO_CROSS@ $(MAKE) checkone ENGINE=./engine/$@; \
 	fi
 
 optgforth-fast:
@@ -904,7 +916,7 @@ tags:		gforth.tags
 		$(CP) gforth.tags $@
 
 install.TAGS:	TAGS install-tags.fs
-		sed 's;^\$(srcdir)/;;' TAGS|./gforth -e 's" '$(datadir)/gforth/$(VERSION)/'"' $(srcdir)/install-tags.fs -e bye >install.TAGS
+		sed 's;^\$(srcdir)/;;' TAGS|$(PREFORTH) -e 's" '$(datadir)/gforth/$(VERSION)/'"' $(srcdir)/install-tags.fs -e bye >install.TAGS
 
 gforth.TAGS:	@kernel_fi@ gforth$(EC)$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS
 		$(FORTHK) etags.fs except.fs startup.fs -e bye