--- gforth/BUILD-FROM-SCRATCH	2001/05/13 10:54:10	1.7
+++ gforth/BUILD-FROM-SCRATCH	2003/03/09 15:16:45	1.12
@@ -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 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -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
@@ -47,17 +55,21 @@ autoconf
 
 autoheader
 
-# run configure script
+# run configure sXScript
 
 ./configure $*
 
 # if you have specified a previous Gforth, you can savely run make now
 # with FORTHK and FORTHP changed appropriate.
 
-if [ "$GFORTH" != "" ]
+#a local gforth.fi probably does not work with $GFORTH
+rm gforth.fi
+
+echo xz
+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