--- gforth/Makefile.in	2007/07/05 16:23:50	1.357
+++ gforth/Makefile.in	2007/10/03 18:41:09	1.368
@@ -59,7 +59,7 @@ CP	= cp -p
 MV	= mv
 TAR	= tar cf -
 INSTALL	= @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 MASSAGE_EXE = @MASSAGE_EXE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@
@@ -263,7 +263,8 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	regexp.fs sokoban.fs string.fs table.fs tags.fs \
 	tt.fs \
 	unbuffer.fs wordsets.fs xwords.fs \
-	test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \
+	test/tester.fs test/ttester.fs \
+	test/coretest.fs test/postpone.fs test/dbltest.fs \
 	test/string.fs test/float.fs test/gforth.fs \
 	test/other.fs test/signals.fs test/checkans.fs \
 	test/primtest.fs test/coreext.fs test/deferred.fs \
@@ -385,8 +386,8 @@ SOURCES	= $(CVSDIRS) compat Makefile.in
 	engine/config.h.in stamp-h.in envos.fs.in \
 	iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \
 	BUILD-FROM-SCRATCH model \
-	COPYING COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \
-	doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \
+	COPYING COPYING.LIB COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \
+	doc/gforth.ds doc/gforth.1 doc/version.texi.in \
 	doc/vmgen.texi doc/fdl.texi doc/gpl.texi \
 	gforth.el \
 	prim cache0.vmg cache1.vmg peeprules.vmg \
@@ -417,7 +418,7 @@ ENGINES = gforth$(EC)$(EXE) gforth-ditc$
 
 ENGINES_FAST = gforth-fast$(EC)$(EXE) #gforth-native$(EXE) 
 
-GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs
+GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs gforth.elc
 
 # things that need a working forth system to be generated
 FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i \
@@ -597,12 +598,12 @@ install:	gforth$(EC)$(EXE) $(FORTH_SRC)
 		done
 		$(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(datadir)/gforth/$(VERSION)
 		@if test -d "$(DESTDIR)$(emacssitelispdir)"; then \
-			$(INSTALL_DATA) $(srcdir)/gforth.el $(DESTDIR)$(emacssitelispdir); \
+			$(INSTALL_DATA) gforth.elc $(DESTDIR)$(emacssitelispdir); \
 		else \
-			echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \
+			echo ">>>>>Please install gforth.elc in your .../emacs/site-lisp directory"; \
 		fi
 		-$(RM) gforth.fi
-		GFORTHD="./gforth-ditc -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" includedir=$(includedir) ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP)
+		GFORTHD="./gforth-ditc -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" includedir=$(includedir) bindir=$bindir GFORTHPATH=.:"$$GFORTHPATH" GFORTHDESTDIR="$(DESTDIR)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP)
 		$(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth/$(VERSION)
 		$(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS
 		$(RM) gforth.fi install.TAGS
@@ -744,7 +745,7 @@ kernl64l$(EC).fi:	$(KERNLS)
 #		-$(CP) $< $@
 
 gforth.fi:	$(kernel_fi) gforthmi gforth$(EC)$(EXE) gforth-ditc$(EC)$(EXE) $(GFORTH_FI_SRC) comp-i.fs
-		GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" includedir=`pwd`/include ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP)
+		GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" includedir=`pwd`/include bindir=`pwd` ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP)
 
 # -------------	Make c-engine
 
@@ -829,8 +830,8 @@ TAGS:		gforth.TAGS
 tags:		gforth.tags
 		$(CP) gforth.tags $@
 
-install.TAGS:	gforth.TAGS
-		sed 's;^\$(srcdir)/;$(datadir)/gforth/$(VERSION)/;' gforth.TAGS >install.TAGS
+install.TAGS:	TAGS
+		sed 's;^\$(srcdir)/;;' TAGS|awk 'BEGIN {RS="\014\n"; ORS=RS} {if (NR==1) print $0; else print "$(datadir)/gforth/$(VERSION)/"$$0;}' >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
@@ -843,10 +844,7 @@ gforth.tags:	@kernel_fi@ gforth$(EC)$(EX
 		rm tags
 
 prim.TAGS: 	prim.b prims2x.fs
-		#echo '2c\' >prim.TAGS.sed
-		#echo $(srcdir)/prim >>prim.TAGS.sed
-		#$(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye" | sed -f prim.TAGS.sed >$@-
-		$(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye" >$@-
+		$(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye"|sed 's#^./prim#prim#' >$@-
 		$(CP) $@- $@
 		$(RM) $@-
 
@@ -864,8 +862,14 @@ kernel.TAGS:
 kernel.tags:
 		rm kernl16l$(EC).fi-; $(MAKE) @kernel_fi@
 
+#elc files
+gforth.elc:	gforth.el
+		emacs -batch -f batch-byte-compile $<
+
+#Documentation
+
 doc/doc.fd:	doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs moofglos.fs
-		$(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs except.fs startup.fs code.fs objects.fs oof.fs moofglos.fs -e bye
+		$(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs except.fs startup.fs code.fs objects.fs oof.fs moofglos.fs regexp.fs -e bye
 
 doc/crossdoc.fd:	$(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
 		$(FORTHK) -e 's" mach32l.fs"' kernel/main.fs -e bye
@@ -879,6 +883,7 @@ doc/gforth.texi:	doc/gforth.ds prim.b ds
 checkdoc:	doc/gforth.ds prim.b ds2texi.fs prims2x.fs doc/doc.fd doc/crossdoc.fd answords.fs doc/gforth.texi
 		$(FORTH) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc ' noop process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye
 		-grep unknown doc/gforth.texi
+		-grep doc- doc/gforth.texi
 
 dvi:		doc/gforth.dvi doc/vmgen.dvi