From f083bd45812c3ef938d5501e4ed3017ddcdc73dc Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Sun, 4 Nov 2012 22:05:14 +0000 Subject: [PATCH] fixed ROS_ROOT after moving env hooks around --- core/roslib/env-hooks/10.ros.sh.em | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/roslib/env-hooks/10.ros.sh.em b/core/roslib/env-hooks/10.ros.sh.em index 4ddc9f03..3805f75a 100644 --- a/core/roslib/env-hooks/10.ros.sh.em +++ b/core/roslib/env-hooks/10.ros.sh.em @@ -35,6 +35,6 @@ export ROS_ROOT=@(CMAKE_CURRENT_SOURCE_DIR)/../.. export ROS_ETC_DIR=@(CATKIN_BUILD_PREFIX)/@(CATKIN_GLOBAL_ETC_DESTINATION)/ros @[else]@ # env variables in installspace -export ROS_ROOT=@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_SHARE_DESTINATION) +export ROS_ROOT=@(CMAKE_INSTALL_PREFIX)/@(CATKIN_GLOBAL_SHARE_DESTINATION)/ros export ROS_ETC_DIR=@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_ETC_DESTINATION) @[end if]@