From b87e5995ed9cb990950c8a81d68c40dfd183cc71 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 22 Jun 2014 12:03:18 +0200 Subject: [PATCH] java-commons-io: source jdk profile instead of setting JAVA_HOME by hand --- srcpkgs/java-commons-io/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/java-commons-io/template b/srcpkgs/java-commons-io/template index 526fcea3713..8bc47fe3ba4 100644 --- a/srcpkgs/java-commons-io/template +++ b/srcpkgs/java-commons-io/template @@ -15,10 +15,11 @@ checksum="961c8b41a891933c2d662d8e490667243ac82422668d1ccdd7bfedfdb944bb58" wrksrc="${_origname}-${version}-src" do_build(){ - cd ${wrksrc} - JAVA_HOME=/usr/share/java/oracle-jdk ant jar - } + cd ${wrksrc} + source /etc/profile.d/oracle-jdk.sh + ant jar +} do_install(){ - vinstall ${wrksrc}/target/${_origname}-2.2-SNAPSHOT.jar 755 /usr/share/java/${_origname} ${_origname}.jar - } + vinstall ${wrksrc}/target/${_origname}-2.2-SNAPSHOT.jar 755 /usr/share/java/${_origname} ${_origname}.jar +}