--- gforth/Makefile.in	2012/06/23 23:44:29	1.478
+++ gforth/Makefile.in	2012/07/14 13:16:02	1.481
@@ -237,6 +237,7 @@ GFORTH_FI_SRC2=\
 	hash.fs \
 	history.fs \
 	intcomp.fs \
+	i18n.fs \
 	mkdir.fs \
 	libcc.fs \
 	locals.fs \
@@ -245,6 +246,7 @@ GFORTH_FI_SRC2=\
 	prelude.fs \
 	quotes.fs \
 	quotedstring.fs \
+	parsedto.fs \
 	search.fs \
 	see.fs \
 	see-ext.fs \
@@ -255,6 +257,7 @@ GFORTH_FI_SRC2=\
 	struct.fs \
 	struct0x.fs \
 	stuff.fs \
+	substitute.fs \
 	tasker.fs \
 	termsize.fs \
 	utf-8.fs \
@@ -666,7 +669,7 @@ install:	gforth$(EXT) $(FORTH_SRC) $(ker
 		@NO_CROSS@$(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth$(ARCH)/$(VERSION)
 		$(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS
 		$(RM) install.TAGS @NO_CROSS@gforth.fi
-		$(INSTALL_DATA) include/gforth/$(VERSION)/* $(DESTDIR)$(includedir)/gforth/$(VERSION)
+		$(INSTALL_DATA) include/gforth$(ARCH)/$(VERSION)/* $(DESTDIR)$(includedir)/gforth$(ARCH)/$(VERSION)
 		if test -n "$(LIBTOOL)"; then for i in $(LIBCC_BUILD_SRC); do \
 		   $(LIBTOOL) --silent --mode=install $(INSTALL) lib/gforth$(ARCH)/$(VERSION)/libcc-named/`basename $$i .fs`.la $(DESTDIR)$(libccdir)`basename $$i .fs`.la; \
 		done; fi
@@ -678,7 +681,7 @@ install-strip:	install
 
 installdirs:	mkinstalldirs
 		$(NORMAL_INSTALL)
-		for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth$(ARCH)/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth/$(VERSION) $(libccdir); do \
+		for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth$(ARCH)/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth$(ARCH)/$(VERSION) $(libccdir); do \
 			$(srcdir)/mkinstalldirs $(DESTDIR)$$i; \
 		done
 		#