cvs commit: jakarta-ant/src/bin ant

[jon]

jon         00/12/04 23:32:14

  Modified:    src/bin  ant
  Log:
  removed requirement for JAVA_HOME to be defined, however,
  you will still need to have "java" in your path if it isn't defined.
  
  Revision  Changes    Path
  1.11      +9 -4      jakarta-ant/src/bin/ant
  
  Index: ant
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/bin/ant,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ant       2000/12/05 07:14:51     1.10
  +++ ant       2000/12/05 07:32:14     1.11
  @@ -45,11 +45,16 @@
   
   fi
   
  -# Allow .antrc to specifiy flags to java cmd
  -if [ "$JAVACMD" = "" ] ; then 
  -  JAVACMD=${JAVA_HOME}/bin/java
  +if [ "$JAVA_HOME" != "" ] ; then
  +  if [ "$JAVACMD" = "" ] ; then 
  +    JAVACMD=$JAVA_HOME/bin/java
  +  fi
  +else
  +  if [ "$JAVACMD" = "" ] ; then 
  +    JAVACMD=java
  +  fi
   fi
  -
  + 
   # add in the dependency .jar files
   DIRLIBS=${ANT_HOME}/lib/*.jar
   for i in ${DIRLIBS}