summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-qt/qt4/qt4.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index d6382f56d1..1406a874ec 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -294,13 +294,13 @@ do_install() {
rm -f ${D}/${bindir}/lrelease
# fix pkgconfig, libtool and prl files
- sed -i -e s#-L${S}/lib##g \
- -e s#-L${STAGING_LIBDIR}##g \
+ sed -i -e s#-L${S}/lib/\?##g \
+ -e s#-L${STAGING_LIBDIR}/\?##g \
-e 's#STAGING_LIBDIR}#libdir}'#g \
- -e s#-L${libdir}##g \
+ -e s#-L${libdir}/\?##g \
-e s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g \
- -e s#" -Wl,-rpath-link,${S}/lib"##g \
- -e s#" -Wl,-rpath-link,${libdir}"##g \
+ -e s#" -Wl,-rpath-link,${S}/lib/\?"##g \
+ -e s#" -Wl,-rpath-link,${libdir}/\?"##g \
-e 's#Iin#I${in#g' \
${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc