dev-util/catkin: Pass PYTHON_INSTALL_DIR to cmake too.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/dev-util/catkin/catkin-0.7.4-r1.ebuild b/dev-util/catkin/catkin-0.7.4-r1.ebuild
index c98407801d62cf57250d6afbead67f89d6c9fad0..6dda0014e8e6b7ee5343132abb010c3856db771b 100644 (file)
--- a/dev-util/catkin/catkin-0.7.4-r1.ebuild
+++ b/dev-util/catkin/catkin-0.7.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -58,7 +58,11 @@ src_prepare() {
 }
 
 catkin_src_configure_internal() {
-       mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+       local sitedir="$(python_get_sitedir)"
+       mycmakeargs+=(
+               -DPYTHON_EXECUTABLE="${PYTHON}"
+               -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
+       )
        python_export PYTHON_SCRIPTDIR
        cmake-utils_src_configure
 }

diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index c98407801d62cf57250d6afbead67f89d6c9fad0..6dda0014e8e6b7ee5343132abb010c3856db771b 100644 (file)
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -58,7 +58,11 @@ src_prepare() {
 }
 
 catkin_src_configure_internal() {
-       mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+       local sitedir="$(python_get_sitedir)"
+       mycmakeargs+=(
+               -DPYTHON_EXECUTABLE="${PYTHON}"
+               -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
+       )
        python_export PYTHON_SCRIPTDIR
        cmake-utils_src_configure
 }