--- bin/ant.orig	Tue May 21 17:57:59 2002
+++ bin/ant	Tue May 21 17:58:50 2002
@@ -3,6 +3,9 @@
 #   Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
 #   reserved.
 
+DEFAULT_JAVACMD=%%JAVA%%
+DEFAULT_JAVA_HOME=%%JAVA_HOME%%
+
 # load system-wide ant configuration
 if [ -f "/etc/ant.conf" ] ; then 
   . /etc/ant.conf
@@ -21,6 +24,10 @@
   . $HOME/.antrc
 fi
 
+if [ -z "$JAVA_HOME" ] ; then
+  JAVA_HOME=$DEFAULT_JAVA_HOME
+fi
+
 # OS specific support.  $var _must_ be set to either true or false.
 cygwin=false;
 darwin=false;
@@ -88,7 +95,7 @@
       JAVACMD="$JAVA_HOME/bin/java"
     fi
   else
-    JAVACMD=java
+    JAVACMD=$DEFAULT_JAVACMD
   fi
 fi
  
