dev-lang/julia: fix Prefix installation, thanks Chris Rorvick, bug #651954

Closes: https://bugs.gentoo.org/651954
Package-Manager: Portage-2.3.24, Repoman-2.3.6

diff --git a/dev-lang/julia/julia-0.6.2.ebuild b/dev-lang/julia/julia-0.6.2.ebuild
index 397cd144fe2d2cd8dd6b9741a632ea3ff04b266d..d1600435e50c5f89614b994dca15aa81573b3810 100644 (file)
--- a/dev-lang/julia/julia-0.6.2.ebuild
+++ b/dev-lang/julia/julia-0.6.2.ebuild
@@ -153,7 +153,8 @@ src_compile() {
 
        emake cleanall
        emake VERBOSE=1 julia-release \
-               prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+               prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+               CC="$(tc-getCC)" CXX="$(tc-getCXX)"
        pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
        emake
 }
@@ -172,7 +173,8 @@ src_install() {
                git commit -a --allow-empty -m "initial" || die "git failed"
 
        emake install \
-               prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+               prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+               CC="$(tc-getCC)" CXX="$(tc-getCXX)"
        cat > 99julia <<-EOF
                LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
        EOF

diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index 86d5657b25d852fa6d677c97be68997ae0ef0398..8e0c10fd426893b90d0371d30e00b5cfa6ed19b0 100644 (file)
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -138,7 +138,8 @@ src_compile() {
 
        emake cleanall
        emake VERBOSE=1 julia-release \
-               prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+               prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+               CC="$(tc-getCC)" CXX="$(tc-getCXX)"
        pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
        emake
 }
@@ -149,7 +150,8 @@ src_test() {
 
 src_install() {
        emake install \
-               prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+               prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+               CC="$(tc-getCC)" CXX="$(tc-getCXX)"
        cat > 99julia <<-EOF
                LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
        EOF