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 | 1285515df77b436de294bd7fd5a43df787c9df9e (patch) | |
| tree | c6388984913965b46abbae49fba664fa8c1dc62e /dev-java/ant-core | |
| parent | respect JAVA_HOME, bug 61665 (diff) | |
| download | historical-1285515df77b436de294bd7fd5a43df787c9df9e.tar.gz historical-1285515df77b436de294bd7fd5a43df787c9df9e.tar.bz2 historical-1285515df77b436de294bd7fd5a43df787c9df9e.zip | |
respect JAVA_HOME, bug 61665
Diffstat (limited to 'dev-java/ant-core')
| -rw-r--r-- | dev-java/ant-core/files/1.6.2-ant | 15 |
1 files changed, 9 insertions, 6 deletions
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 |