diff options
author | Michał Górny <mgorny@gentoo.org> | 2012-10-30 17:22:33 +0000 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2012-10-30 17:22:33 +0000 |
commit | cfc6825f8f450675cf0f758e64e2391897b79261 (patch) | |
tree | 465b903921fcf607c7365d7a4b43ff4d2159b28c /eclass | |
parent | Stable for HPPA (bug #437602). (diff) | |
download | gentoo-2-cfc6825f8f450675cf0f758e64e2391897b79261.tar.gz gentoo-2-cfc6825f8f450675cf0f758e64e2391897b79261.tar.bz2 gentoo-2-cfc6825f8f450675cf0f758e64e2391897b79261.zip |
Fix Prefix support, wrt bug #423323.
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/ChangeLog | 5 | ||||
-rw-r--r-- | eclass/python-distutils-ng.eclass | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 4cdc4617f4e7..a6d0248743ce 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.484 2012/10/29 13:34:02 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.485 2012/10/30 17:22:33 mgorny Exp $ + + 30 Oct 2012; Michał Górny <mgorny@gentoo.org> python-distutils-ng.eclass: + Fix Prefix support, wrt bug #423323. 29 Oct 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass: Support and use out-of-source builds by default. diff --git a/eclass/python-distutils-ng.eclass b/eclass/python-distutils-ng.eclass index d957b1d77735..249757fb8b91 100644 --- a/eclass/python-distutils-ng.eclass +++ b/eclass/python-distutils-ng.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.28 2012/09/27 16:35:41 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.29 2012/10/30 17:22:33 mgorny Exp $ # @ECLASS: python-distutils-ng # @MAINTAINER: @@ -98,9 +98,9 @@ _python-distutils-ng_get_binary_for_implementation() { local impl="${1/_/.}" case "${impl}" in python?.?|jython?.?) - echo "/usr/bin/${impl}" ;; + echo "${EPREFIX}/usr/bin/${impl}" ;; pypy?.?) - echo "/usr/bin/pypy-c${impl: -3}" ;; + echo "${EPREFIX}/usr/bin/pypy-c${impl: -3}" ;; *) die "Unsupported implementation: ${1}" ;; esac @@ -400,7 +400,7 @@ python-distutils-ng_src_install() { fi if [[ -z "${PYTHON_DISABLE_SCRIPT_REDOS}" ]]; then - for script_file in $(find "${D}"{,usr/}{,s}bin/ -type f -executable 2> /dev/null); do + for script_file in $(find "${ED}"{,usr/}{,s}bin/ -type f -executable 2> /dev/null); do python-distutils-ng_redoscript "/${script_file#${D}}" done fi |