summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2017-02-09 18:19:21 +0100
committerAlexis Ballier <aballier@gentoo.org>2017-02-09 18:46:02 +0100
commit902cc5598bd239ce893e02ca2f8d1917de9368ec (patch)
treef821fb8684d011df6eca3ad5975af168ad84ec84 /eclass/ros-catkin.eclass
parentdev-util/catkin: Pass PYTHON_INSTALL_DIR to cmake too. (diff)
downloadgentoo-902cc5598bd239ce893e02ca2f8d1917de9368ec.tar.gz
gentoo-902cc5598bd239ce893e02ca2f8d1917de9368ec.tar.bz2
gentoo-902cc5598bd239ce893e02ca2f8d1917de9368ec.zip
eclass/ros-catkin.eclass: Set PYTHON_INSTALL_DIR when building python packages.
Diffstat (limited to 'eclass/ros-catkin.eclass')
-rw-r--r--eclass/ros-catkin.eclass7
1 files changed, 6 insertions, 1 deletions
diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass
index 61d01429b54..93086aa123a 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 "${@}"