--- gforth/BUILD-FROM-SCRATCH	2001/05/13 10:54:10	1.7
+++ gforth/BUILD-FROM-SCRATCH	2007/07/05 16:23:50	1.18
@@ -1,6 +1,8 @@
 # Procedures to build gforth from the CVS sources
 
-#Copyright (C) 2000 Free Software Foundation, Inc.
+#use this with parameters and env variables like "configure"
+
+#Copyright (C) 2000,2002,2003,2006 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -22,7 +24,7 @@
 # created: 2may00jaw
 
 # To build gforth from scratch you need autoconf, automake and a 
-# gforth0.5.0
+# gforth-0.6.2
 # This file can be used as shell script. If you make the environment
 # variable GFORTH point to an existing gforth installation, this
 # script takes over the whole build process and will produce the
@@ -30,9 +32,15 @@
 
 # try to guess a installed gforth
 
-if [ "$GFORTH" == "" ]
+if [ "$GFORTH"xx = "xx" ];
 then
+	rm -f gforth
 	GFORTH=`which gforth`
+	if [ "$GFORTH"xx = "xx" ]; then
+		echo 'BUILD-FROM-SCRATCH needs a working gforth (in environment variable GFORTH)'
+                exit 1
+        fi
+	GFORTH="$GFORTH -m4M"
 fi
 
 # makes a aclocal.m4 which includes the automake macros for autconf
@@ -46,18 +54,22 @@ autoconf
 # generate header files like engine/config.h.in
 
 autoheader
+echo timestamp >stamp-h.in
+
+# run configure Script
 
-# run configure script
+./configure "$@"
 
-./configure $*
+# if you have specified a previous Gforth, you can safely run make now
+# with FORTHK and FORTHP changed appropriately.
 
-# if you have specified a previous Gforth, you can savely run make now
-# with FORTHK and FORTHP changed appropriate.
+#a local gforth.fi probably does not work with $GFORTH
+rm -f gforth.fi
 
-if [ "$GFORTH" != "" ]
+if [ "$GFORTH"xx != "xx" ]
 then
- echo Running: make BUILDFORTH="$GFORTH" gforth...
- make BUILDFORTH="$GFORTH" gforth
- echo Running: make BUILDFORTH="$GFORTH" all...
- make BUILDFORTH="$GFORTH" all
+ echo Running: make BUILDFORTH="$GFORTH" FORTHP="$GFORTH" gforth...
+ make BUILDFORTH="$GFORTH" FORTHP="$GFORTH" gforth
+ echo Running: make BUILDFORTH="$GFORTH" FORTHP="$GFORTH" all...
+ make BUILDFORTH="$GFORTH" FORTHP="$GFORTH" all
 fi