Merge pull request #308 from simkim/master

roslaunch: Use as documented environment

recipes-ros/ros-comm/roslaunch/roscore-default

-ROS_ROOT=/usr
+ROS_ROOT=/opt/ros/hydro/
 ROS_PORT=11311
-ROS_MASTER_URI=http://localhost:$ROS_PORT
-CMAKE_PREFIX_PATH=$ROS_ROOT
+ROS_MASTER_URI=http://localhost:11311
+CMAKE_PREFIX_PATH=/opt/ros/hydro/
+PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/ros/hydro/bin
+LD_LIBRARY_PATH=/opt/ros/hydro/lib
+PYTHONPATH=/opt/ros/hydro/lib/python2.7/site-packages

recipes-ros/ros-comm/roslaunch/roscore.service

@@ -5,7 +5,7 @@ After=network.target
 [Service]
 EnvironmentFile=/etc/default/roscore
 ExecStartPre=/bin/touch ${CMAKE_PREFIX_PATH}/.catkin
-ExecStart=/usr/bin/roscore -p $ROS_PORT
+ExecStart=/opt/ros/hydro/bin/roscore -p $ROS_PORT
 Restart=on-abort
 
 [Install]