--- gforth/Makefile.in	2008/07/15 15:23:42	1.408
+++ gforth/Makefile.in	2008/08/09 13:24:25	1.417
@@ -1,6 +1,6 @@
 #Makefile for Gforth
 
-#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
+#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -66,6 +66,7 @@ INSTALL_INFO = @INSTALL_INFO@
 LN_S	= @LN_S@
 M4      = @M4@
 GCC	= @CC@
+EMACS   = emacs
 PREFORTH	= ./preforth -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)"
 CC	= $(GCC)
 FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)
@@ -348,14 +349,8 @@ ARCHS =	\
 	arch/sharc/types.h \
 	arch/sharc/g21k-3.3.4-bp1.diff \
 	arch/r8c/asm.fs \
-	arch/r8c/asm-test.fs \
-	arch/r8c/prim.fs \
-	arch/r8c/errors.fs \
-	arch/r8c/tt.fs \
-	arch/r8c/tasker.fs \
-	arch/r8c/lauflicht.fs \
-	arch/r8c/terminal.fs \
-	arch/r8c/mach.fs
+	arch/r8c/mach.fs \
+	arch/r8c/prim.fs
 
 #not included in distribution until distribution terms are included:
 ARCHS_NO_DIST = \
@@ -372,6 +367,12 @@ ARCHS_NO_DIST = \
 	arch/c165/mach.fs \
 	arch/c165/prim.fs \
 	arch/h8/asm.fs \
+	arch/r8c/asm-test.fs \
+	arch/r8c/errors.fs \
+	arch/r8c/lauflicht.fs \
+	arch/r8c/tasker.fs \
+	arch/r8c/terminal.fs \
+	arch/r8c/tt.fs \
 	arch/sharc/unistd.h
 
 VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \
@@ -399,8 +400,8 @@ ENGINE_SOURCES = engine/Makefile.in engi
 
 SOURCES	= $(CVSDIRS) $(ENGINE_SOURCES) compat Makefile.in Makedist.in \
 	gforthmi.in vmgen.in preforth.in gfgen README.vmgen NEWS.vmgen \
-	configure.in configure config.sub config.guess elisp-comp missing \
-	stamp-h.in envos.fs.in \
+	autogen.sh configure.in configure config.sub config.guess \
+	elisp-comp missing stamp-h.in envos.fs.in \
 	iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \
 	BUILD-FROM-SCRATCH model \
 	COPYING COPYING.LIB COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \
@@ -424,7 +425,7 @@ ENGINES = gforth$(EC)$(EXE) gforth-ditc$
 
 ENGINES_FAST = gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(OPT)$(EC)$(EXE) 
 
-GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs gforth.elc
+GEN = $(ENGINES) $(ENGINES_FAST) 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 \
@@ -610,9 +611,10 @@ install:	gforth$(EC)$(EXE) $(FORTH_SRC)
 		done
 		$(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(datadir)/gforth/$(VERSION)
 		@if test -d "$(DESTDIR)$(emacssitelispdir)"; then \
+			$(INSTALL_DATA) gforth.el $(DESTDIR)$(emacssitelispdir); \
 			$(INSTALL_DATA) gforth.elc $(DESTDIR)$(emacssitelispdir); \
 		else \
-			echo ">>>>>Please install gforth.elc in your .../emacs/site-lisp directory"; \
+			echo '>>>>>Please install gforth.{el,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) bindir=$(bindir) libccdir=$(libccdir) GFORTHPATH=.:"$$GFORTHPATH" GFORTHDESTDIR="$(DESTDIR)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP)
@@ -620,7 +622,7 @@ install:	gforth$(EC)$(EXE) $(FORTH_SRC)
 		$(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS
 		$(RM) gforth.fi install.TAGS
 		$(INSTALL_DATA) include/gforth/$(VERSION)/* $(DESTDIR)$(includedir)/gforth/$(VERSION)
-		for i in $(LIBCC_SRC); do libtool --silent --mode=install $(INSTALL) lib/gforth/$(VERSION)/libcc-named/`basename $$i .fs`.la $(DESTDIR)$(libccdir)`basename $$i .fs`.la; done
+		for i in $(LIBCC_SRC); do @GNU_LIBTOOL@ --silent --mode=install $(INSTALL) lib/gforth/$(VERSION)/libcc-named/`basename $$i .fs`.la $(DESTDIR)$(libccdir)`basename $$i .fs`.la; done
 		$(POST_INSTALL)
 		$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gforth.info
 		#$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/vmgen.info
@@ -806,7 +808,7 @@ MAKELINE-noll-reg = OPT=-noll-reg OPTDEF
 MAKELINE-ll       = OPT=-ll OPTDEFINES=-DFORCE_LL OPTOBJECTS=
 MAKELINE-noll     = OPT=-noll OPTDEFINES= OPTOBJECTS=dblsub.o
 
-gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/config.h $(kernel_fi)
+gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/config.h @kernel_anti_dependence@
 	if test -z "$(OPT)"; then \
 		for i in $(OPTS); do $(MAKE) optgforth OPT=$$i && $(CP) gforth$${i}$(EC)$(EXE) $@ && break; done; \
 	else \
@@ -907,7 +909,7 @@ kernel.tags:
 
 #elc files
 gforth.elc:	gforth.el
-		emacs -batch -f batch-byte-compile $<
+		-$(EMACS) -batch -f batch-byte-compile $<
 
 #Documentation