--- src/script/ant.orig	Wed Jul 10 10:45:03 2002
+++ src/script/ant	Wed Jul 10 10:46:36 2002
@@ -3,11 +3,17 @@
 #   Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
 #   reserved.
 
+# avoid use of previously ant conf in bootstrap/build mode
+#
+if [ -z "$ANT_BOOTSTRAP" ]; then
+
 # load system-wide ant configuration
 if [ -f "/etc/ant.conf" ] ; then 
   . /etc/ant.conf
 fi
 
+fi
+
 # provide default values for people who don't use RPMs
 if [ -z "$rpm_mode" ] ; then
   rpm_mode=false;
@@ -70,7 +76,7 @@
 fi
 
 # set ANT_LIB location
-ANT_LIB=${ANT_HOME}/lib
+ANT_LIB="${ANT_HOME}/lib"
 
 # For Cygwin, ensure paths are in UNIX format before anything is touched
 if $cygwin ; then
@@ -111,14 +117,14 @@
   for i in ant ant-optional jaxp_parser xml_apis 
   do
     if [ -z "$LOCALCLASSPATH" ] ; then
-      LOCALCLASSPATH=$JAVALIBDIR/$i.jar
+      LOCALCLASSPATH="$JAVALIBDIR/$i.jar"
     else
       LOCALCLASSPATH="$JAVALIBDIR/$i.jar":"$LOCALCLASSPATH"
     fi
   done
 
 # in rpm mode ant/lib is in /usr/share/java/ant
-ANT_LIB=${JAVALIBDIR}/ant
+ANT_LIB="${JAVALIBDIR}/ant"
 
 fi