--- gforth/Makefile.in	2003/03/02 13:12:32	1.257
+++ gforth/Makefile.in	2003/05/13 09:36:59	1.266
@@ -1,6 +1,6 @@
 #Makefile for Gforth
 
-#Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
+#Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -75,7 +75,7 @@ FORTHS	= $(ENGINE) $(FORTHS_ARGS)
 # possible to override this variable at the command line for an initial build (jaw)
 BUILDFORTH = $(ENGINE) --die-on-signal -m 4M -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)
 # the forth system plus flags we use to build
-FORTHB = $(BUILDFORTH) -e 'fpath= .|~+|$(srcdir)' except.fs
+FORTHB = $(BUILDFORTH) -e 3 exboot.fs -e 'fpath= .|~+|$(srcdir)'
 # the Forth system for running prims2x.fs
 FORTHP = $(FORTH)
 ENGINE_FAST = $(ENGINE)-fast
@@ -88,7 +88,7 @@ FORTHK	= $(ENGINE) $(FORTHKFLAGS)
 STARTUP	= -e 3 exboot.fs startup.fs @asm_fs@ @disasm_fs@
 STRIP	= strip
 TEXI2DVI = texi2dvi -e
-DVI2PS	= dvips -Z
+DVI2PS	= dvips -t letterSize -Z
 #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/
 MAKEINFO = makeinfo
 TEXI2HTML = texi2html
@@ -236,7 +236,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \
 	glosgen.fs gray.fs httpd.fs proxy.fs \
 	make-app.fs doc/makedoc.fs \
-	more.fs other.fs prims2x.fs random.fs \
+	locate.fs more.fs other.fs prims2x.fs random.fs \
 	sokoban.fs string.fs table.fs tags.fs \
 	tt.fs \
 	unbuffer.fs wordsets.fs \
@@ -276,7 +276,6 @@ ARCHS =	\
 	arch/sparc/machine.h \
 	arch/power/machine.h \
 	arch/power/_sync_cache_range.c \
-	arch/power/elf32ppc.x \
 	arch/alpha/machine.h \
 	arch/ia64/machine.h \
 	arch/4stack/README \
@@ -370,7 +369,8 @@ GEN = gforth$(EXE) gforth-ditc$(EXE) gfo
 # things that need a working forth system to be generated
 FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i \
 	engine/prim_superend.i engine/profile.i \
-	engine/prim_num.i engine/prim_grp.i
+	engine/prim_num.i engine/prim_grp.i \
+	engine/costs.i engine/super2.i
 FORTH_GEN0 = prim.b $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs kernel/groups.fs
 FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ gforth.fi
 # this is used for antidependences,
@@ -535,12 +535,8 @@ install:	gforth$(EXE) $(FORTH_SRC) $(ker
 		$(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)
 		$(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS
 		$(RM) gforth.fi install.TAGS
-		@$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/gforth.info || \
-		echo ">>>>> Please make an entry for Gforth in your info dir file; e.g.:"; \
-		echo "* Gforth: (gforth).	A fast interpreter for the Forth language."
-		@$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/vmgen.info || \
-		echo ">>>>> Please make an entry for Vmgen in your info dir file; e.g.:"; \
-		echo "* Vmgen: (vmgen).               Virtual machine interpreter generator"
+		$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/gforth.info
+		$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/vmgen.info
 
 install-strip:	install
 
@@ -714,6 +710,11 @@ engine/profile.i:	prim.b prims2x.fs
 		$(CP) $@- $@
 		$(RM) $@-
 
+engine/super2.i:	prim.b prims2x.fs
+		$(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-super2 dup process-file bye" >$@-
+		$(CP) $@- $@
+		$(RM) $@-
+
 engine/costs.i:	prim.b prims2x.fs
 		$(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-costs dup process-file bye" >$@-
 		$(CP) $@- $@
@@ -721,7 +722,7 @@ engine/costs.i:	prim.b prims2x.fs
 
 kernel/aliases.fs:	prim.b prims2x.fs kernel/aliases0.fs
 		$(CP) kernel/aliases0.fs $@-
-		$(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias dup process-file bye" >>$@-
+		$(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias ' noop process-file bye" >>$@-
 		$(CP) $@- $@
 		$(RM) $@-