diff options
| author |   Karl Trygve Kalleberg <karltk@gentoo.org> | 2002-10-18 20:19:05 +0000 |
|---|---|---|
| committer | Karl Trygve Kalleberg <karltk@gentoo.org> | 2002-10-18 20:19:05 +0000 |
| commit | 4770ca655d09f70308433a7acb46203daf4841b0 (patch) | |
| tree | 82db5576190bb2477489e9e172d002186d664116 /dev-java | |
| parent | Fixes #8691. (diff) | |
| download | gentoo-2-4770ca655d09f70308433a7acb46203daf4841b0.tar.gz gentoo-2-4770ca655d09f70308433a7acb46203daf4841b0.tar.bz2 gentoo-2-4770ca655d09f70308433a7acb46203daf4841b0.zip | |
Fixes a script bug.
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/ant/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/ant/files/1.5/ant | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog index d82735908241..2fe33d0e02d6 100644 --- a/dev-java/ant/ChangeLog +++ b/dev-java/ant/ChangeLog @@ -1,9 +1,12 @@ # ChangeLog for dev-java/ant # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.9 2002/10/14 18:21:21 karltk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.10 2002/10/18 20:19:05 karltk Exp $ *ant-1.5 (26 Jul 2002) + 18 Oct 2002; Karl Trygve Kalleberg <karltk@gentoo.org> files/1.5/ant : + Fixed nasty oversight in script. + 14 Oct 2002; Karl Trygve Kalleberg <karltk@gentoo.org> files/1.5/ant : Fixed bugs with script as reported in #7732. Marked for testing. diff --git a/dev-java/ant/files/1.5/ant b/dev-java/ant/files/1.5/ant index b83ea6b4e6eb..fd9989747fcc 100644 --- a/dev-java/ant/files/1.5/ant +++ b/dev-java/ant/files/1.5/ant @@ -10,6 +10,7 @@ else JAVA_HOME=`java-config --jdk-home` if [ -z $JAVA_HOME ] ; then JAVA_HOME=`java-config --jre-home` + fi CLASSPATH=`java-config --classpath` fi @@ -37,7 +38,7 @@ ANT_HOME=/usr/share/ant # set ANT_LIB location ANT_LIB=${ANT_HOME}/lib -JAVACMD="${JAVA_HOME}/java" +JAVACMD="${JAVA_HOME}/bin/java" if [ ! -x "$JAVACMD" ] ; then echo "Error: We cannot execute $JAVACMD " @@ -50,7 +51,7 @@ if [ -n "$CLASSPATH" ] ; then fi # add in the dependency .jar files -LOCALCLASSPATH=`${LOCALCLASSPATH}:java-config --classpath=ant` +LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant`" if [ -n "$JAVA_HOME" ] ; then if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then |