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

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

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

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

# contributor license agreements. See the NOTICE file distributed with

# this work for additional information regarding copyright ownership.

+

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

+ANT_HOME=${ANT_HOME:-/usr}

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

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

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

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

fi

# set ANT_LIB location

-ANT_LIB="${ANT_HOME}/lib"

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

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

+else

+ ANT_LIB="${ANT_HOME}/lib"

+fi

if [ -z "$JAVACMD" ] ; then

if [ -n "$JAVA_HOME" ] ; then