diff options
| -rw-r--r-- | dev-java/gcj-jdk/files/gcj-jdk.env.sh | 4 | ||||
| -rw-r--r-- | dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild (renamed from dev-java/gcj-jdk/gcj-jdk-5.4.0.ebuild) | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/dev-java/gcj-jdk/files/gcj-jdk.env.sh b/dev-java/gcj-jdk/files/gcj-jdk.env.sh index 97ef10ed596a..ff967fa2c1c7 100644 --- a/dev-java/gcj-jdk/files/gcj-jdk.env.sh +++ b/dev-java/gcj-jdk/files/gcj-jdk.env.sh @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 VERSION="GCJ ${PV}" -JAVA_HOME="${EPREFIX}/usr/lib/${P}" -JDK_HOME="${EPREFIX}/usr/lib/${P}" +JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${P}" +JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${P}" JAVAC="\${JAVA_HOME}/bin/javac" PATH="\${JAVA_HOME}/bin" ROOTPATH="\${JAVA_HOME}/bin" diff --git a/dev-java/gcj-jdk/gcj-jdk-5.4.0.ebuild b/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild index 13821c4840e6..c56dd496f7c1 100644 --- a/dev-java/gcj-jdk/gcj-jdk-5.4.0.ebuild +++ b/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit java-vm-2 multilib +inherit java-vm-2 DESCRIPTION="Java wrappers around GCJ" HOMEPAGE="https://www.gentoo.org/" |