summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Almenar <strider@gentoo.org>2003-09-22 04:01:28 +0000
committerAdrian Almenar <strider@gentoo.org>2003-09-22 04:01:28 +0000
commit75abe2b6db4c7c2cb226a581cb421172b5930199 (patch)
treefcd6b49b65c4679040b5e935eab2190c9e21f91c /dev-java
parentfixing Manifest (diff)
downloadgentoo-2-75abe2b6db4c7c2cb226a581cb421172b5930199.tar.gz
gentoo-2-75abe2b6db4c7c2cb226a581cb421172b5930199.tar.bz2
gentoo-2-75abe2b6db4c7c2cb226a581cb421172b5930199.zip
File update
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/ant/Manifest2
-rw-r--r--dev-java/ant/files/1.5.4/ant10
2 files changed, 6 insertions, 6 deletions
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 496e8ddc8494..dfdee7087093 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -9,4 +9,4 @@ MD5 0bf5f1d0dfa292c160318e00bb085a3e files/digest-ant-1.5.3-r4 76
MD5 0bf5f1d0dfa292c160318e00bb085a3e files/digest-ant-1.5.3-r5 76
MD5 6e22e7d1b121a847e107b6498f48e0a4 files/1.5.3/ant 2207
MD5 9cb067e9b0997856af50e7e117263596 files/1.5.3/1_6_backport-jdk142.patch.gz 916
-MD5 2830ac0751b72ce17c065a8a52571112 files/1.5.4/ant 2206
+MD5 42d14e6ea90cdb790e61fb8a044aa091 files/1.5.4/ant 2270
diff --git a/dev-java/ant/files/1.5.4/ant b/dev-java/ant/files/1.5.4/ant
index 1e2966124f03..5031617026f2 100644
--- a/dev-java/ant/files/1.5.4/ant
+++ b/dev-java/ant/files/1.5.4/ant
@@ -3,20 +3,19 @@
# 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.5.4/ant,v 1.1 2003/09/22 03:44:49 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/files/1.5.4/ant,v 1.2 2003/09/22 04:01:22 strider Exp $
if [ -f $HOME/.gentoo/java-env ] ; then
source $HOME/.gentoo/java-env
else
JAVA_HOME=`java-config --jdk-home`
- if [ -z $JAVA_HOME ] ; then
- JAVA_HOME=`java-config --jre-home`
- fi
CLASSPATH=`java-config --classpath`:${CLASSPATH}
fi
if [ -z $JAVA_HOME ] ; then
- echo "Error: No JDK/JRE found!"
+ echo "Error: No JDK found!"
+ echo "Try using java-config script to set your JDK"
+ echo "Remember that you need a JDK not a JRE"
exit 1
fi
@@ -72,6 +71,7 @@ else
echo " If build fails because sun.* classes could not be found"
echo " you will need to set the JAVA_HOME environment variable"
echo " to the installation directory of java."
+ echo " Try using java-config script"
fi
# Allow Jikes support (off by default)