aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/qt4/qt4.inc
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-03-01 20:23:52 +0100
committerKoen Kooi <koen@openembedded.org>2010-03-02 09:58:37 +0100
commit35df67a0c18bf45d23aeec68960e108f8c20a656 (patch)
treed912f477ca7ba20dac92af84c3d957738cda6fa1 /recipes/qt4/qt4.inc
parentf2f69d9ae0d32b5adff4987d12a7c4924e24555c (diff)
downloadopenembedded-35df67a0c18bf45d23aeec68960e108f8c20a656.tar.gz
qt4: adjust sed magic to recent QT to sanitize .pc files properly
Diffstat (limited to 'recipes/qt4/qt4.inc')
-rw-r--r--recipes/qt4/qt4.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index c98a0557e5..b6d575d67a 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -243,9 +243,13 @@ do_install() {
# fix pkgconfig, libtool and prl files
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#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g \
- -e s#"-Wl,-rpath-link,${S}/lib"##g \
+ -e s#" -Wl,-rpath-link,${S}/lib"##g \
+ -e s#" -Wl,-rpath-link,${libdir}"##g \
+ -e 's#I/usr/include#Iincludedir}#g' \
+ -e 's#Iin#I${in#g' \
${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc
# fix pkgconfig files