--- gforth/Makefile.in	2000/08/26 13:29:47	1.182
+++ gforth/Makefile.in	2000/09/23 15:05:58	1.188
@@ -1,6 +1,6 @@
 #Makefile for Gforth
 
-#Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+#Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -62,7 +62,7 @@ INSTALL_DATA = @INSTALL_DATA@
 LN_S	= @LN_S@
 GCC	= @CC@
 CC	= $(GCC)
-FORTHPATH = ~+$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)
+FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)
 FORTHSIZES = @FORTHSIZES@
 FORTH_ARGS = --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir)
 ENGINE = ./gforth
@@ -72,6 +72,8 @@ FORTH_FAST	= $(ENGINE_FAST) $(FORTH_ARGS
 FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)
 FORTHK	= $(ENGINE) $(FORTHKFLAGS)
 FORTHP	= $(ENGINE) --die-on-signal -i ./$(kernel_fi)
+#the "-2 image-included-files +!" undoes the change to image-included-files
+# in exboot.fs
 STARTUP	= -e 3 exboot.fs startup.fs @asm_fs@ @disasm_fs@
 STRIP	= strip
 TEXI2DVI = texi2dvi -e
@@ -119,7 +121,7 @@ CVSDIRS = CVS engine/CVS kernel/CVS doc/
 	arch/386/CVS arch/hppa/CVS arch/sparc/CVS arch/power/CVS \
 	arch/alpha/CVS arch/4stack/CVS arch/misc/CVS arch/6502/CVS \
 	arch/8086/CVS arch/avr/CVS arch/c165/CVS arch/h8/CVS \
-	arch/shboom/CVS
+	arch/shboom/CVS arch/ia64/CVS
 
 INCLUDES = engine/forth.h engine/threaded.h engine/io.h
 
@@ -256,6 +258,7 @@ ARCHS =	\
 	arch/power/_sync_cache_range.c \
 	arch/power/elf32ppc.x \
 	arch/alpha/machine.h \
+	arch/ia64/machine.h \
 	arch/4stack/README \
 	arch/4stack/asm.fs \
 	arch/4stack/mach.fs \
@@ -447,12 +450,13 @@ binonlydist:	Makedist FORCE
 
 
 #strip gforth, because the debugging stuff is hardly useful once
-# gforth manages to execute more than a few primitives
+# gforth manages to execute more than a few primitives.
 
 #install does not depend on gforth.info, because that would require
 #supplying a lot of files that can be easily generated (only info is
-#hard to generate)
-#gforth.fi and install.TAGS is rm'ed after installing because of ownership
+#hard to generate).
+#we rebuild gforth.fi, because it contains some path names.
+#we delete $build/gforth.fi and $build/install.TAGS after installation because of ownership.
 install:	gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi doc/gforth.1 prim install.TAGS installdirs
 		touch $(siteforthdir)/siteinit.fs
 		-$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi
@@ -470,16 +474,16 @@ install:	gforth$(EXE) $(FORTH_SRC) $(ker
 			$(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION)/$$i; \
 		done
 		$(INSTALL_DATA) $(kernel_fi) $(datadir)/gforth/$(VERSION)
-		$(RM) gforth.fi
-		GFORTHD="./gforth-ditc -p$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) #gforth.fi contains some path names
-		$(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)
-		$(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS
-		$(RM) gforth.fi install.TAGS
 		@if test -d "$(emacssitelispdir)"; then \
 			$(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \
 		else \
 			echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \
 		fi
+		$(RM) gforth.fi
+		GFORTHD="./gforth-ditc -p$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP)
+		$(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)
+		$(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS
+		$(RM) gforth.fi install.TAGS
 		@echo ">>>>> Please make an entry for Gforth in your info dir file; e.g.:"; \
 		echo "* Gforth: (gforth).	A fast interpreter for the Forth language."
 
@@ -650,7 +654,9 @@ gforth.TAGS:	@kernel_fi@ gforth$(EXE) $(
 		rm TAGS
 
 prim.TAGS: 	prim.b prims2x.fs
-		$(FORTHK) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag process-file bye" >$@-
+		echo '2c\' >prim.TAGS.sed
+		echo $(srcdir)/prim >>prim.TAGS.sed
+		$(FORTHK) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag process-file bye" | sed -f prim.TAGS.sed >$@-
 		$(CP) $@- $@
 		$(RM) $@-
 
@@ -683,10 +689,10 @@ info:		doc/gforth.info
 doc/gforth.info doc/gforth.info-*: $(GFORTH_TEXI)
 		-cd doc; $(MAKEINFO) gforth.texi
 
+### need makeinfo 4.0 to generate html. Otherwise, use texi2html..
 html:		$(GFORTH_TEXI)
 		-$(RMTREE) html
 		-mkdir html
-### need makeinfo 4.0 to generate html. Otherwise, use texi2html..
 		cd html; $(MAKEINFO) --html -I ../doc ../doc/gforth.texi
 ###		cd html; $(TEXI2HTML) -menu -split_node ../doc/gforth.texi