diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2004-09-17 00:10:42 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2004-09-17 00:10:42 +0000 |
| commit | 5453c4faaf233c2fdcef802f209fdf23a1342a37 (patch) | |
| tree | e1391dce874aafa0014b2a28fe798036ac771dad /dev-java/ant-core | |
| parent | respect JAVA_HOME, bug 61665 (diff) | |
| download | gentoo-2-5453c4faaf233c2fdcef802f209fdf23a1342a37.tar.gz gentoo-2-5453c4faaf233c2fdcef802f209fdf23a1342a37.tar.bz2 gentoo-2-5453c4faaf233c2fdcef802f209fdf23a1342a37.zip | |
respect JAVA_HOME, bug 61665
Diffstat (limited to 'dev-java/ant-core')
| -rw-r--r-- | dev-java/ant-core/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/ant-core/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/ant-core/files/1.6.2-ant | 15 |
3 files changed, 15 insertions, 9 deletions
diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog index ced177f34d2e..57c70b086e8b 100644 --- a/dev-java/ant-core/ChangeLog +++ b/dev-java/ant-core/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/ant # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.2 2004/09/10 23:20:56 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.3 2004/09/17 00:08:24 axxo Exp $ + + 17 Sep 2004; Thomas Matthijs <axxo@gentoo.org> files/1.6.2-ant: + respect JAVA_HOME, bug 61665 11 Sep 2004; Thomas Matthijs <axxo@gentoo.org> ant-core-1.6.2.ebuild: removed pkg_setup, not used anyway, moved the ppc threads_flags to diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest index a2c38fc4bf24..eb09470a775e 100644 --- a/dev-java/ant-core/Manifest +++ b/dev-java/ant-core/Manifest @@ -1,9 +1,9 @@ MD5 40aa3e15b499670f159be6f3c96753d3 ant-core-1.5.4.ebuild 3037 MD5 037813c558155f6d4db1cd8a1179456b ant-core-1.6.2.ebuild 1774 -MD5 38f23d2ee0a304f66664612d1a02415c ChangeLog 13924 +MD5 916976adc68ae9a416128752177c175a ChangeLog 14022 MD5 4dad079a28768d183022cff420f01281 metadata.xml 220 MD5 b876b365c3d68c3dc528148056af16f9 files/1.5.4-ant 2278 -MD5 cb0aa98c29e3c4ee4bcd2913b226c1d6 files/1.6.2-ant 5010 +MD5 5c9edba8c5a6444d657c7243946012bf files/1.6.2-ant 5009 MD5 4383441650437fec5622070e48e4324c files/build.sh-exit-fix.patch.gz 256 MD5 55ece9ccf573b244b3dff966839528c5 files/rpmbuild.patch.gz 1164 MD5 8d86f265f37d0d73cdd2e8a3fd2ff6eb files/digest-ant-core-1.5.4 70 diff --git a/dev-java/ant-core/files/1.6.2-ant b/dev-java/ant-core/files/1.6.2-ant index 645db65e6ae9..9096cb9b43a0 100644 --- a/dev-java/ant-core/files/1.6.2-ant +++ b/dev-java/ant-core/files/1.6.2-ant @@ -15,7 +15,7 @@ # limitations under the License. # Edited for Gentoo Linux -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.6.2-ant,v 1.1 2004/09/10 19:45:18 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.6.2-ant,v 1.2 2004/09/17 00:08:25 axxo Exp $ # Extract launch and ant arguments, (see details below). ant_exec_args= @@ -68,11 +68,14 @@ else fi fi -if [ -f $HOME/.gentoo/java-env ] ; then - source $HOME/.gentoo/java-env -else - JAVA_HOME=`java-config --jdk-home` - CLASSPATH=`java-config --classpath`:${CLASSPATH} + +if [ -z $JAVA_HOME ] ; then + if [ -f $HOME/.gentoo/java-env ] ; then + source $HOME/.gentoo/java-env + else + JAVA_HOME=`java-config --jdk-home` + CLASSPATH=`java-config --classpath`:${CLASSPATH} + fi fi if [ -z $JAVA_HOME ] ; then |