Index: ros-1.12.5/tools/rosbash/scripts/rosrun
===================================================================
--- ros-1.12.5.orig/tools/rosbash/scripts/rosrun
+++ ros-1.12.5/tools/rosbash/scripts/rosrun
@@ -47,7 +47,7 @@ case $2 in
     ;;
 esac
 
-if [[ -n $CMAKE_PREFIX_PATH ]]; then
+if [[ -n $CMAKE_PREFIX_PATH || -n $CATKIN_PREFIX_PATH ]]; then
   IFS=$'\n'
   catkin_package_libexec_dirs=(`catkin_find --without-underlays --libexec --share "$1" 2> /dev/null`)
   unset IFS