Merge pull request #29 from ros/fix_jsp

joint_state_publisher: do not install script to global bin

joint_state_publisher/CMakeLists.txt

@@ -1,9 +1,7 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(joint_state_publisher)
 
-find_package(catkin)
-
-catkin_python_setup()
+find_package(catkin REQUIRED)
 
 catkin_package()
 

joint_state_publisher/joint_state_publisher/joint_state_publisher

@@ -1,6 +1,5 @@
 #!/usr/bin/python
 
-import roslib; roslib.load_manifest('joint_state_publisher')
 import rospy
 import wx
 import wx.lib.newevent

joint_state_publisher/setup.py

@@ -1,9 +0,0 @@
-from distutils.core import setup
-from catkin_pkg.python_setup import generate_distutils_setup
-
-d = generate_distutils_setup()
-d['packages'] = []
-d['scripts'] = ['joint_state_publisher/joint_state_publisher']
-d['package_dir'] = {}
-
-setup(**d)