diff options
| author |   Chris Aniszczyk <zx@gentoo.org> | 2004-03-17 04:20:12 +0000 |
|---|---|---|
| committer | Chris Aniszczyk <zx@gentoo.org> | 2004-03-17 04:20:12 +0000 |
| commit | bdbc013149dc7811968c589560cf8a6f9fe1df09 (patch) | |
| tree | 0e433a675a253319514742157ed0b09477ae62c4 /dev-java/ant | |
| parent | small cleanup (diff) | |
| download | gentoo-2-bdbc013149dc7811968c589560cf8a6f9fe1df09.tar.gz gentoo-2-bdbc013149dc7811968c589560cf8a6f9fe1df09.tar.bz2 gentoo-2-bdbc013149dc7811968c589560cf8a6f9fe1df09.zip | |
quick fix on deps to ant exec
Diffstat (limited to 'dev-java/ant')
| -rw-r--r-- | dev-java/ant/files/1.6.1/ant | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dev-java/ant/files/1.6.1/ant b/dev-java/ant/files/1.6.1/ant index 1145ee266800..45bbe392ef2e 100644 --- a/dev-java/ant/files/1.6.1/ant +++ b/dev-java/ant/files/1.6.1/ant @@ -3,7 +3,7 @@ # Copyright (c) 2001-2003 The Apache Software Foundation. All rights # reserved. # Edited for Gentoo Linux -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/files/1.6.1/ant,v 1.2 2004/03/17 03:31:58 zx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/files/1.6.1/ant,v 1.3 2004/03/17 04:20:12 zx Exp $ if [ -f $HOME/.gentoo/java-env ] ; then source $HOME/.gentoo/java-env @@ -50,13 +50,13 @@ if [ ! -x "$JAVACMD" ] ; then exit 1 fi -if [ -z "$LOCALCLASSPATH" ] ; then - LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar -else - LOCALCLASSPATH="$ANT_LIB/ant-launcher.jar:${LOCALCLASSPATH}:`java-config --classpath=ant,ant-optional,log4j,xerces,xalan,junit,antlr,bcel,bsh,commons-beanutils,commons-logging,commons-net,oro,jdepend,jsch,regexp,rhino,jython,jta,jaf,javamail 2> /dev/null`" + +if [ -n "$CLASSPATH" ] ; then + LOCALCLASSPATH="$CLASSPATH" fi # add in the dependency .jar files +LOCALCLASSPATH="$ANT_LIB/ant-launcher.jar:${LOCALCLASSPATH}:`java-config --classpath=ant,ant-optional,log4j,xerces,xalan,junit,antlr,bcel,bsh,commons-beanutils,commons-logging,commons-net,oro,jdepend,jsch,regexp,rhino,jython,jta,jaf,javamail 2> /dev/null`" if [ -n "$JAVA_HOME" ] ; then if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then |