diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-12-30 14:17:29 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-12-30 14:17:29 +0000 |
| commit | b51ad9dc6d7bf55b179ed94e35048c713ef5c168 (patch) | |
| tree | 11addcf4e79fec564d51c50ff1b3ad69de356853 /eclass | |
| parent | Stable for sparc, wrt bug #448056 (diff) | |
| download | gentoo-2-b51ad9dc6d7bf55b179ed94e35048c713ef5c168.tar.gz gentoo-2-b51ad9dc6d7bf55b179ed94e35048c713ef5c168.tar.bz2 gentoo-2-b51ad9dc6d7bf55b179ed94e35048c713ef5c168.zip | |
Fix installing scripts & modules for Prefix, bug #448786.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/python-utils-r1.eclass | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 9dddb00659ec..0ee386495ad2 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.580 2012/12/29 17:47:53 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.581 2012/12/30 14:17:29 mgorny Exp $ + + 30 Dec 2012; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass: + Fix installing scripts & modules for Prefix, bug #448786. 29 Dec 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass: some adaption for new makefile handling, >=vdr-1.7.34 diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 0359e14268cd..fe7a3e4276d5 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.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-utils-r1.eclass,v 1.10 2012/12/27 22:56:53 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.11 2012/12/30 14:17:29 mgorny Exp $ # @ECLASS: python-utils-r1 # @MAINTAINER: @@ -490,10 +490,10 @@ python_doscript() { debug-print "${FUNCNAME}: ${oldfn} -> ${newfn}" newins "${f}" "${newfn}" || die - _python_rewrite_shebang "${D}/${d}/${newfn}" + _python_rewrite_shebang "${ED}/${d}/${newfn}" # install the wrapper - _python_ln_rel "${ED}"/usr/bin/python-exec "${D}/${d}/${oldfn}" || die + _python_ln_rel "${ED}"/usr/bin/python-exec "${ED}/${d}/${oldfn}" || die done } @@ -501,7 +501,7 @@ python_doscript() { # @DEFAULT_UNSET # @DESCRIPTION: # The current module root for python_domodule(). The path can be either -# an absolute system path (it must start with a slash, and ${D} will be +# an absolute system path (it must start with a slash, and ${ED} will be # prepended to it) or relative to the implementation's site-packages directory # (then it must start with a non-slash character). # @@ -561,7 +561,7 @@ python_domodule() { local PYTHON_SITEDIR=${PYTHON_SITEDIR} [[ ${PYTHON_SITEDIR} ]] || python_export PYTHON_SITEDIR - d=${PYTHON_SITEDIR}/${python_moduleroot} + d=${PYTHON_SITEDIR#${EPREFIX}}/${python_moduleroot} fi local INSDESTTREE @@ -569,7 +569,7 @@ python_domodule() { insinto "${d}" doins -r "${@}" || die - python_optimize "${D}/${d}" + python_optimize "${ED}/${d}" } _PYTHON_UTILS_R1=1 |