1 --- apache-ant-1.7.1/src/script/ant.orig	Fri Feb 25 07:25:24 2011

     2 +++ apache-ant-1.7.1/src/script/ant	Fri Feb 25 07:34:29 2011

     3 @@ -3,6 +3,9 @@

     4  # Licensed to the Apache Software Foundation (ASF) under one or more

     5  # contributor license agreements.  See the NOTICE file distributed with

     6  # this work for additional information regarding copyright ownership.

     7 +

     8 +JAVA_HOME=${JAVA_HOME:-/usr/java}

     9 +ANT_HOME=${ANT_HOME:-/usr}

    10  # The ASF licenses this file to You under the Apache License, Version 2.0

    11  # (the "License"); you may not use this file except in compliance with

    12  # the License.  You may obtain a copy of the License at

    13 @@ -120,7 +123,11 @@

    14  fi

    15  

    16  # set ANT_LIB location

    17 -ANT_LIB="${ANT_HOME}/lib"

    18 +if [ "$ANT_HOME" = "/usr" ] ; then

    19 +  ANT_LIB="${ANT_HOME}/share/lib/ant"

    20 +else

    21 +  ANT_LIB="${ANT_HOME}/lib"

    22 +fi

    23  

    24  if [ -z "$JAVACMD" ] ; then

    25    if [ -n "$JAVA_HOME"  ] ; then