ros-catkin.eclass: Properly append VER_SUFFIX to S in non-live case.

Some ROS packages append some suffix to their version, e.g. the ROS version they target, and the release tarballs have this string appended to their unpack directory too.

diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass
index f1bc32eb8f945bb0efc00eaf7cd076e3bfa185dc..412ff66e01c937476964eb95e3c71caa819c578f 100644 (file)
--- a/eclass/ros-catkin.eclass
+++ b/eclass/ros-catkin.eclass
@@ -125,7 +125,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
        S=${WORKDIR}/${P}/${ROS_SUBDIR}
 else
        SRC_URI="${ROS_REPO_URI}/archive/${VER_PREFIX}${PV%_*}${VER_SUFFIX}.tar.gz -> ${ROS_REPO_URI##*/}-${PV}.tar.gz"
-       S=${WORKDIR}/${VER_PREFIX}${ROS_REPO_URI##*/}-${PV}/${ROS_SUBDIR}
+       S=${WORKDIR}/${VER_PREFIX}${ROS_REPO_URI##*/}-${PV}${VER_SUFFIX}/${ROS_SUBDIR}
 fi
 
 HOMEPAGE="http://wiki.ros.org/${PN}"