$NetBSD: patch-aa,v 1.1 2005/09/03 22:59:25 tonio Exp $ --- bin/ant.orig 2005-05-19 14:37:16.000000000 +0200 +++ bin/ant 2005-05-25 14:38:03.000000000 +0200 @@ -86,6 +86,15 @@ ;; esac +if [ "$ANT_HOME" = "" ] ; then + # try to find ANT + ANT_HOME=@PREFIX@ +fi + +if [ "$JAVA_HOME" = "" ] ; then + JAVA_HOME=@JAVA_HOME@ +fi + if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then ## resolve links - $0 may be a link to ant's home PRG="$0" @@ -117,7 +126,12 @@ fi # set ANT_LIB location -ANT_LIB="${ANT_HOME}/lib" +ANT_LIB="${ANT_HOME}/lib/java/ant" + +# use ${PREFIX}/bin/java (wrapper) +if [ "$JAVACMD" = "" ] ; then + JAVACMD=@PREFIX@/bin/java +fi if [ -z "$JAVACMD" ] ; then if [ -n "$JAVA_HOME" ] ; then