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.
johu · Oct 11, 2015 · daf3d8e · daf3d8e
1 parent 620a2a9
commit daf3d8e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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}"