--- gforth/Makefile.in	2002/12/15 18:19:41	1.233
+++ gforth/Makefile.in	2002/12/27 15:51:28	1.237
@@ -30,7 +30,7 @@
 
 # ------------- gforth version
 
-VERSION	= @VERSION@
+VERSION	= @PACKAGE_VERSION@
 DOSVERSION=`echo $(VERSION)|sed 's/\.//g'|sed 's/-.*//g'`
 
 # -------------	System specific variables	
@@ -192,6 +192,7 @@ GFORTH_FI_SRC = \
 	blocked.fb \
 	blocks.fs \
 	bufio.fs \
+	code.fs \
 	debug.fs \
 	debugs.fs \
 	ekey.fs \
@@ -228,7 +229,7 @@ GFORTH_FI_SRC = \
 
 FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \
 	ans-report.fs ansi.fs answords.fs \
-	code.fs colorize.fs comp-i.fs \
+	colorize.fs comp-i.fs \
 	doskey.fs ds2texi.fs \
 	envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \
 	glosgen.fs gray.fs httpd.fs proxy.fs \
@@ -333,14 +334,15 @@ VMGEN_EX2 = $(VMGEN_EX:vmgen-ex/%=vmgen-
 SOURCES	= $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in \
 	gforthmi.in vmgen.in README.vmgen NEWS.vmgen \
 	configure.in configure config.sub config.guess elisp-comp missing \
-	acconfig.h acinclude.m4 engine/config.h.in stamp-h.in \
+	engine/config.h.in stamp-h.in \
 	iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS model \
 	COPYING COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \
 	doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \
 	doc/vmgen.texi doc/fdl.texi \
 	gforth.el \
 	prim peeprules.vmg engine/engine.c engine/main.c \
-	engine/io.c engine/memcmpc.c engine/signals.c $(ARCHS) \
+	engine/io.c engine/support.c engine/memcmpc.c engine/signals.c \
+	$(ARCHS) \
 	engine/peephole.c engine/profile.c \
 	engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \
 	engine/ecvt.c engine/memcmp.c engine/strtol.c engine/strtoul.c \
@@ -359,7 +361,8 @@ SOURCES	= $(CVSDIRS) compat Makefile.in
 
 RCS_FILES =  ToDo model high-level
 
-GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-native$(EXE) gforth-itc$(EXE) gforth-prof$(EXE) kernel/version.fs
+GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) kernel/version.fs
+#gforth-native$(EXE) gforth-prof$(EXE)
 
 # things that need a working forth system to be generated
 FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i \
@@ -644,7 +647,7 @@ prim.b:		prim peeprules.vmg
 		m4 -s $(srcdir)/prim >$@ 
 
 engine/prim.i:		prim.b prims2x.fs
-		$(FORTHP) prims2x.fs -e "c-flag on s\" prim.i\" out-filename 2! s\" prim.b\" ' output-c ' output-c-combined process-file bye" >$@-
+		$(FORTHP) prims2x.fs -e "c-flag on s\" prim.i\" save-mem out-filename 2! s\" prim.b\" ' output-c ' output-c-combined process-file bye" >$@-
 		$(CP) $@- $@
 		$(RM) $@-
 
@@ -717,10 +720,10 @@ gforth-ditc$(EXE):	engines
 gforth-prof$(EXE):	engines
 		$(CP) engine/$@ $@
 
-gforths: gforth$(EXE) gforth-fast$(EXE) gforth-native$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE)
+gforths: gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) #gforth-prof$(EXE) gforth-native$(EXE)
 
 engines:	FORCE $(FORTH_GEN_ENGINE) engine/Makefile
-		cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-native$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE)
+		cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) #gforth-prof$(EXE) gforth-native$(EXE)
 
 # ------------- additional C primitives
 
@@ -833,28 +836,27 @@ doc:		info doc/gforth doc/vmgen doc/gfor
 
 #Note: no target "$(srcdir)/configure", because that does not trigger 
 #unless $(srcdir)!="."
-configure:	configure.in aclocal.m4
-		cd $(srcdir) && autoconf
+configure: configure.in aclocal.m4
+	cd $(srcdir) && autoconf
 
-aclocal.m4:	acinclude.m4 configure.in
+aclocal.m4:	configure.in
 		aclocal
 
 # autoheader might not change config.h.in, so touch a stamp file.
-engine/config.h.in:	stamp-h.in
-stamp-h.in:	configure.in  acconfig.h
-		cd $(srcdir) && autoheader
-		echo timestamp > $(srcdir)/stamp-h.in
-
-engine/config.h:	stamp-h
-stamp-h:	engine/config.h.in config.status
-		CONFIG_FILES=$@ CONFIG_HEADERS="engine/config.h" ./config.status
-		echo timestamp > stamp-h
+engine/config.h.in: stamp-h.in
+stamp-h.in: configure.in aclocal.m4
+	cd $(srcdir) && autoheader
+	echo timestamp > $(srcdir)/stamp-h.in
+
+engine/config.h: stamp-h
+stamp-h: engine/config.h.in config.status
+	./config.status
 
-Makefile Makedist engine/Makefile gforthmi vmgen machpc.fs doc/version.texi:	Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in doc/version.texi.in config.status configure.in
-		CONFIG_FILES="$@" CONFIG_HEADERS="engine/config.h" ./config.status
+Makedist engine/Makefile gforthmi vmgen machpc.fs doc/version.texi:	Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in doc/version.texi.in config.status configure.in
+	./config.status
 
-config.status:	configure
-		./config.status --recheck
+config.status: configure
+	./config.status --recheck
 
 
 #create files for DOS, because DOS cannot do it itself