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

[Alexis Ballier]

commit:     902cc5598bd239ce893e02ca2f8d1917de9368ec
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  9 17:19:21 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Feb  9 17:46:02 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=902cc559

eclass/ros-catkin.eclass: Set PYTHON_INSTALL_DIR when building python packages.

 eclass/ros-catkin.eclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass
index 61d01429b5..93086aa123 100644
--- a/eclass/ros-catkin.eclass
+++ b/eclass/ros-catkin.eclass
@@ -157,7 +157,12 @@ ros-catkin_src_prepare() {
 # Internal decoration of cmake-utils_src_configure to handle multiple python 
installs.
 ros-catkin_src_configure_internal() {
        if [ -n "${CATKIN_DO_PYTHON_MULTIBUILD}" ] ; then
-               local mycmakeargs=("${mycmakeargs[@]}" 
-DPYTHON_EXECUTABLE="${PYTHON}")
+               local sitedir="$(python_get_sitedir)"
+               local mycmakeargs=(
+                       "${mycmakeargs[@]}"
+                       -DPYTHON_EXECUTABLE="${PYTHON}"
+                       -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
+               )
                python_export PYTHON_SCRIPTDIR
        fi
        cmake-utils_src_configure "${@}"