diff options
| author |   Jeremy Olexa <darkside@gentoo.org> | 2011-08-09 19:06:37 +0000 |
|---|---|---|
| committer | Jeremy Olexa <darkside@gentoo.org> | 2011-08-09 19:06:37 +0000 |
| commit | e1c45ee3f6587f6e980e60b4e13ae6a125f334d4 (patch) | |
| tree | 03c705e9feca187ab07fe9377984f0c1b3c6a3da /eclass | |
| parent | [bump] perl-core/bignum-0.290.0 (diff) | |
| download | historical-e1c45ee3f6587f6e980e60b4e13ae6a125f334d4.tar.gz historical-e1c45ee3f6587f6e980e60b4e13ae6a125f334d4.tar.bz2 historical-e1c45ee3f6587f6e980e60b4e13ae6a125f334d4.zip | |
migrate Gentoo Prefix changes
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/findlib.eclass | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/eclass/findlib.eclass b/eclass/findlib.eclass index a824627a8104..4a1e2e5f8eed 100644 --- a/eclass/findlib.eclass +++ b/eclass/findlib.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/findlib.eclass,v 1.9 2009/02/08 21:30:12 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/findlib.eclass,v 1.10 2011/08/09 19:06:37 darkside Exp $ # @ECLASS: findlib.eclass # @MAINTAINER: @@ -20,7 +20,7 @@ DEPEND=">=dev-ml/findlib-1.0.4-r1" [[ ${FINDLIB_USE} ]] && DEPEND="${FINDLIB_USE}? ( ${DEPEND} )" check_ocamlfind() { - if [ ! -x /usr/bin/ocamlfind ] + if [ ! -x "${EPREFIX}"/usr/bin/ocamlfind ] then eerror "In findlib.eclass: could not find the ocamlfind executable" eerror "Please report this bug on gentoo's bugzilla, assigning to ml@gentoo.org" @@ -34,13 +34,18 @@ check_ocamlfind() { # We use the stublibs style, so no ld.conf needs to be # updated when a package installs C shared libraries. findlib_src_preinst() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + has "${EAPI:-0}" 0 1 2 && use !prefix && ED="${D}" check_ocamlfind # destdir is the ocaml sitelib local destdir=`ocamlfind printconf destdir` + # strip off prefix + destdir=${destdir#${EPREFIX}} + dodir ${destdir} || die "dodir failed" - export OCAMLFIND_DESTDIR=${D}${destdir} + export OCAMLFIND_DESTDIR=${ED}${destdir} # stublibs style dodir ${destdir}/stublibs || die "dodir failed" |