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

Package-Manager: Portage-2.3.3, Repoman-2.3.1
johu · Feb 9, 2017 · 008d1bf · 008d1bf
1 parent 851539d
commit 008d1bf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git 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
@@ -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
 }