[Lunar-commits] <moonbase> apache-ant: fixing can't java home, closes BR387.

[Dennis 'stumbles' Veatch]

commit ce80cb15ceeca8d8900024523f58c1e8232857d3
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Wed Apr 1 07:31:51 2009 -0400

    apache-ant: fixing can't java home, closes BR387.
---
 devel/apache-ant/BUILD |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/devel/apache-ant/BUILD b/devel/apache-ant/BUILD
index ae3adcd..a5237b1 100644
--- a/devel/apache-ant/BUILD
+++ b/devel/apache-ant/BUILD
@@ -1,11 +1,10 @@
 (
+
   if module_installed sun-jdk; then
-    JAVA_VERSION=`installed_version sun-jdk`;
-    export JAVA_HOME="/usr/lib/jdk${JAVA_VERSION}";
+     . /etc/profile.d/sun-jdk.rc
   else
-    JAVA_VERSION=`installed_version j2sdk`;
-    export JAVA_HOME="/usr/lib/j2sdk${JAVA_VERSION}";
-  fi
+     . /etc/profile.d/sun-jre.rc
+  fi &&
 
   # apache-ant build will fail without junit since 1.7.0
   sedit 's:depends="jars,test-jar":depends="jars":g' build.xml &&
@@ -14,6 +13,7 @@
 
   ./build.sh -Ddist.dir=/usr/share/ant &&
   gather_docs TODO WHATSNEW welcome.html &&
+
   for each in ant antRun runant.pl runant.py complete-ant-cmd.pl ; do
     ln -sf /usr/share/ant/bin/${each} /usr/bin/${each}
   done