blob: 8a9a9f0a4a7129919991af11bbcb770004ac29ad (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
$NetBSD: patch-aa,v 1.6 2018/02/25 20:44:59 wiz Exp $
Initialize paths to appropriate defaults for pkgsrc.
--- bin/ant.orig 2018-02-03 16:51:21.000000000 +0000
+++ bin/ant
@@ -91,6 +91,15 @@ else
# load user ant configuration
if [ -f "$HOME/.ant/ant.conf" ]; then
+if [ "$ANT_HOME" = "" ] ; then
+ # try to find ANT
+ ANT_HOME=@PREFIX@
+fi
+
+if [ "$JAVA_HOME" = "" ] ; then
+ JAVA_HOME='@JAVA_HOME@'
+fi
+
. $HOME/.ant/ant.conf
fi
if [ -f "$HOME/.antrc" ]; then
@@ -172,7 +181,12 @@ if $mingw; then
fi
# set ANT_LIB location
-ANT_LIB="${ANT_HOME}/lib"
+ANT_LIB="${ANT_HOME}/lib/java/ant"
+
+# use ${PREFIX}/bin/java (wrapper)
+if [ "$JAVACMD" = "" ] && [ -f @PREFIX@/bin/java ] ; then
+ JAVACMD=@PREFIX@/bin/java
+fi
if [ -z "$JAVACMD" ]; then
if [ -n "$JAVA_HOME" ]; then
|
