diff --git a/recipes-ros/roscpp-serialization/roscpp-serialization_0.3.12.bb b/recipes-ros/roscpp-serialization/roscpp-serialization_0.3.12.bb
index ae982f7f09ee5dbc4d891b382c6a93ace33f1289..19fcba25bfa8fbeffc08348bbe4fdd7f6318f0c2 100644
--- a/recipes-ros/roscpp-serialization/roscpp-serialization_0.3.12.bb
+++ b/recipes-ros/roscpp-serialization/roscpp-serialization_0.3.12.bb
@@ -14,10 +14,10 @@ DEPENDS = "catkin-native \
   roscpp-traits \
   rostime"
 
-EXTRA_OECMAKE = \
-  " -Dcpp_common_DIR=/home/lukas/poky-danny-8.0/build/tmp/sysroots/qemux86/usr/share/cpp_common/cmake/ \
-    -Droscpp_traits_DIR=/home/lukas/poky-danny-8.0/build/tmp/sysroots/qemux86/usr/share/roscpp_traits/cmake/ \
-    -Drostime_DIR=/home/lukas/poky-danny-8.0/build/tmp/sysroots/qemux86/usr/share/rostime/cmake/ \
+EXTRA_OECMAKE = " \
+    -Dcpp_common_DIR=${STAGING_DATADIR}/cpp_common/cmake/ \
+    -Droscpp_traits_DIR=${STAGING_DATADIR}/roscpp_traits/cmake/ \
+    -Drostime_DIR=${STAGING_DATADIR}/rostime/cmake/ \
   "
 
 inherit cmake pythonnative
diff --git a/recipes-ros/rostime/rostime_0.3.12.bb b/recipes-ros/rostime/rostime_0.3.12.bb
index 48258798f33b65defa31bd608b76ed2bf46827eb..3fbd62bf20430133dc5f053ae18a7590086bf26a 100644
--- a/recipes-ros/rostime/rostime_0.3.12.bb
+++ b/recipes-ros/rostime/rostime_0.3.12.bb
@@ -16,5 +16,6 @@ FILES_${PN} += "${libdir}/*"
 
 inherit cmake pythonnative
 
-EXTRA_OECMAKE = "-DCMAKE_PREFIX_PATH=/home/lukas/poky-danny-8.0/build/tmp/sysroots/qemux86/usr/share/cpp_common/cmake/ \
-  -Dcpp_common_DIR=/home/lukas/poky-danny-8.0/build/tmp/sysroots/qemux86/usr/share/cpp_common/cmake/"
+EXTRA_OECMAKE = " \
+  -Dcpp_common_DIR=${STAGING_DATADIR}/cpp_common/cmake/ \
+  "