diff --git a/classes/hawaii-target.bbclass b/classes/hawaii-target.bbclass
index 50f72542..1f0e9471 100644
--- a/classes/hawaii-target.bbclass
+++ b/classes/hawaii-target.bbclass
@@ -1,6 +1,14 @@
 EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=Release"
 
-# target files cause that our dependencies do not find us
+# REVISIT: dirty hack to avoid libraries using me to fail at configuraton/compilation
 do_install_append() {
-	rm -f ${D}/${libdir}/cmake/*/*Targets-release.cmake
+	# libpath
+	for file in $(find ${D}${libdir}/cmake -name '*Targets-release.cmake') ; do
+		sed -i 's:\"${libdir}:\"${STAGING_DIR_TARGET}${libdir}:' $file
+	done
+	# incpath
+	for file in $(find ${D}${libdir}/cmake -name '*Targets.cmake') ; do
+		sed -i 's:INTERFACE_INCLUDE_DIRECTORIES \":INTERFACE_INCLUDE_DIRECTORIES \"${STAGING_DIR_TARGET}:' $file
+	done
+
 }