34 lines
915 B
Plaintext
34 lines
915 B
Plaintext
$OpenBSD: patch-bin_ant,v 1.6 2011/05/02 07:20:34 landry Exp $
|
|
--- bin/ant.orig Fri Jun 27 01:03:55 2008
|
|
+++ bin/ant Thu Feb 11 17:00:29 2010
|
|
@@ -122,27 +122,9 @@ fi
|
|
# set ANT_LIB location
|
|
ANT_LIB="${ANT_HOME}/lib"
|
|
|
|
-if [ -z "$JAVACMD" ] ; then
|
|
- if [ -n "$JAVA_HOME" ] ; then
|
|
- # IBM's JDK on AIX uses strange locations for the executables
|
|
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
|
- JAVACMD="$JAVA_HOME/jre/sh/java"
|
|
- elif [ -x "$JAVA_HOME/jre/bin/java" ] ; then
|
|
- JAVACMD="$JAVA_HOME/jre/bin/java"
|
|
- else
|
|
- JAVACMD="$JAVA_HOME/bin/java"
|
|
- fi
|
|
- else
|
|
- JAVACMD=`which java 2> /dev/null `
|
|
- if [ -z "$JAVACMD" ] ; then
|
|
- JAVACMD=java
|
|
- fi
|
|
- fi
|
|
-fi
|
|
+JAVACMD=$(javaPathHelper -c apache-ant)
|
|
|
|
-if [ ! -x "$JAVACMD" ] ; then
|
|
- echo "Error: JAVA_HOME is not defined correctly."
|
|
- echo " We cannot execute $JAVACMD"
|
|
+if [ -z "${JAVACMD}" ]; then
|
|
exit 1
|
|
fi
|
|
|