--- gforth/Makefile.in	2010/01/08 18:54:34	1.449
+++ gforth/Makefile.in	2010/12/30 21:46:14	1.454
@@ -129,7 +129,7 @@ datarootdir = @datarootdir@
 datadir = @datadir@
 #read-only architecture-dependent non-ascii files
 libdir = @libdir@
-libccdir = $(libdir)/gforth/$(VERSION)/libcc-named/
+libccdir = $(subst $(DESTDIR),,$(libdir)/gforth/$(VERSION)/libcc-named/)
 includedir = @includedir@
 infodir = @infodir@
 htmldir = @htmldir@
@@ -189,7 +189,8 @@ KERN_SRC = \
 	kernel/doers.fs \
 	kernel/getdoers.fs \
 	kernel/pass.fs \
-	kernel/xchars.fs
+	kernel/xchars.fs \
+	string.fs
 
 EC_SRC = \
 	asm/README \
@@ -207,7 +208,7 @@ EC_SRC = \
 	ec/nesting.fs \
 	build-ec.in
 
-GFORTH_FI_SRC = \
+GFORTH_FI_SRC1=\
 	assert.fs \
 	backtrac.fs \
 	blocked.fb \
@@ -218,7 +219,8 @@ GFORTH_FI_SRC = \
 	debugs.fs \
 	dis-gdb.fs \
 	ekey.fs \
-	envos.fs \
+
+GFORTH_FI_SRC2=\
 	savesys.fs \
 	environ.fs \
 	errors.fs \
@@ -255,17 +257,30 @@ GFORTH_FI_SRC = \
 	arch/386/asm.fs arch/386/disasm.fs \
 	arch/amd64/asm.fs arch/amd64/disasm.fs \
 	arch/alpha/asm.fs arch/alpha/disasm.fs arch/alpha/testasm.fs\
+	arch/arm/asm.fs arch/arm/disasm.fs \
+	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
 
+# execlude envos.fs into list of distributed sources
+GFORTH_FI_DIST_SRC = \
+	$(GFORTH_FI_SRC1) \
+	$(GFORTH_FI_SRC2)
+
+GFORTH_FI_SRC = \
+	$(GFORTH_FI_SRC1) \
+	envos.fs \
+	$(GFORTH_FI_SRC2)
+
 LIBCC_SRC = cstr.fs unix/socket.fs
 
 LIBCC_DIST_SRC = libffi.fs fflib.fs $(LIBCC_SRC)
 
 LIBCC_BUILD_SRC = @LIBCC_BUILD_SRC@ $(LIBCC_SRC)
 
-FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) $(LIBCC_DIST_SRC) \
+
+FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_DIST_SRC) $(EC_SRC) $(LIBCC_DIST_SRC) \
 	ans-report.fs ansi.fs answords.fs \
 	colorize.fs comp-i.fs complex.fs \
 	depth-changes.fs dosekey.fs doskey.fs ds2texi.fs \
@@ -313,6 +328,7 @@ ARCHS =	\
 	arch/generic/machine.h \
 	arch/m68k/machine.h \
 	arch/mips/machine.h \
+	arch/mips/check_prim.c \
 	arch/386/machine.h \
 	arch/hppa/machine.h \
 	arch/hppa/cache.c \
@@ -616,7 +632,7 @@ install:	gforth$(EC)$(EXE) $(FORTH_SRC)
 		(cd $(DESTDIR)$(bindir) && $(LN_S) vmgen-$(VERSION) vmgen)
 		-$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(DESTDIR)$(man1dir)
 		-for i in $(srcdir)/doc/gforth.info* $(srcdir)/doc/vmgen.info*; do $(INSTALL_DATA) $$i $(DESTDIR)$(infodir); done
-		for i in $(FORTH_SRC) $(COMPAT) prim; do \
+		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)
@@ -660,7 +676,7 @@ uninstall:	FORCE
 
 build-libcc-named: $(LIBCC_BUILD_SRC) $(FORTH_GEN) $(GEN) FORCE
 		$(RMTREE) lib/gforth/$(VERSION)/libcc-named/
-		for i in $(LIBCC_BUILD_SRC); do ./gforth -e "s\" `pwd`/lib/gforth/$(VERSION)/libcc-named/\" libcc-named-dir-v 2! libcc-path clear-path libcc-named-dir libcc-path also-path :noname 2drop s\" $(libccdir)\" ; is replace-rpath" $(srcdir)/$$i -e bye; done
+		for i in $(LIBCC_BUILD_SRC); do ./gforth -e "s\" `pwd`/lib/gforth/$(VERSION)/libcc-named/\" libcc-named-dir-v 2! libcc-path clear-path libcc-named-dir libcc-path also-path :noname 2drop s\" $(DESTDIR)$(libccdir)\" ; is replace-rpath" $(srcdir)/$$i -e bye; done
 
 check:		gforths	gforth.fi 
 		$(MAKE) checkone check-nofast ENGINE="./gforth --no-dynamic" >/dev/null 2>&1