Add environment PYTHONPATH, #123.

ros · Apr 24, 2012 · 19b316c · 19b316c
1 parent 1e45c25
commit 19b316c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/cmake/templates/python_distutils_install.sh.in b/cmake/templates/python_distutils_install.sh.in
@@ -17,8 +17,11 @@ fi
 cd @INSTALL_CMD_WORKING_DIRECTORY@
 
 # todo --install-layout=deb per platform
+# Note that PYTHONPATH is pulled from the environment to support installing
+# into one location when some dependencies were installed in another
+# location, #123.
 /usr/bin/env \
-    PYTHONPATH=@INSTALLED_PYTHONPATH@:@CMAKE_BINARY_DIR@/gen/py \
+    PYTHONPATH=@INSTALLED_PYTHONPATH@:@CMAKE_BINARY_DIR@/gen/py:$PYTHONPATH \
     CATKIN_BINARY_DIR=@CMAKE_BINARY_DIR@ \
     @PYTHON_EXECUTABLE@ \
     @CMAKE_CURRENT_SOURCE_DIR@/setup.py \