From 885cfdfdf9b8259cbeb1e69c2a393bb9b368cbe2 Mon Sep 17 00:00:00 2001
From: Enno Boland <eb@s01.de>
Date: Sun, 22 Jun 2014 12:01:21 +0200
Subject: [PATCH] apache-ant: source jdk profile instead of setting JAVA_HOME
 by hand

---
 srcpkgs/apache-ant/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache-ant/template b/srcpkgs/apache-ant/template
index e6f80ff7923..ade690ac095 100644
--- a/srcpkgs/apache-ant/template
+++ b/srcpkgs/apache-ant/template
@@ -20,11 +20,13 @@ do_configure() {
 }
 
 do_build() {
-	JAVA_HOME=/usr/share/java/oracle-jdk ./build.sh -Ddist.dir=$DESTDIR/$_prefix jars
+	source /etc/profile.d/oracle-jdk.sh
+	./build.sh -Ddist.dir=$DESTDIR/$_prefix jars
 }
 
 do_install() {
-	JAVA_HOME=/usr/share/java/oracle-jdk ./build.sh -Ddist.dir=$DESTDIR/$_prefix dist
+	source /etc/profile.d/oracle-jdk.sh
+	./build.sh -Ddist.dir=$DESTDIR/$_prefix dist
 
 	vinstall ${FILESDIR}/apache-ant.sh 644 etc/profile.d
 	rm $DESTDIR/$_prefix/bin/*.bat