[gentoo-commits] repo/gentoo:master commit in: eclass/

[Alexis Ballier]

commit:     e1fc443474a804c1a7a8160e83259285520ee44f
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  7 13:55:55 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Dec  7 19:31:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1fc4434

eclass/oasis.eclass: set prefix to ED instead of using the destdir option. The 
latter doesnt work reliably with latest oasis versions.

 eclass/oasis.eclass | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/eclass/oasis.eclass b/eclass/oasis.eclass
index 6299f28..6b1fc4f 100644
--- a/eclass/oasis.eclass
+++ b/eclass/oasis.eclass
@@ -86,10 +86,9 @@ oasis_src_configure() {
        [ -n "${OASIS_BUILD_TESTS}" ] && confargs="${confargs} $(use_enable 
test tests)"
        [ -n "${OASIS_NO_DEBUG}"    ] || confargs="${confargs} 
$(oasis_use_enable debug debug)"
        ${OASIS_SETUP_COMMAND:-ocaml setup.ml} -configure \
-               --prefix "${EPREFIX}/usr" \
-               --libdir "${EPREFIX}/usr/$(get_libdir)" \
-               --docdir "${EPREFIX}${OASIS_DOC_DIR}" \
-               --destdir "${D}" \
+               --prefix "${ED}/usr" \
+               --libdir "${ED}/usr/$(get_libdir)" \
+               --docdir "${ED}${OASIS_DOC_DIR}" \
                $(oasis_use_enable ocamlopt is_native) \
                ${confargs} \
                ${oasis_configure_opts} \