[oe-commits] Koen Kooi : qt4: adjust sed magic to recent QT to sanitize . pc files properly

[git version control]

Module: openembedded.git
Branch: shr/testing2010
Commit: 35df67a0c18bf45d23aeec68960e108f8c20a656
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=35df67a0c18bf45d23aeec68960e108f8c20a656

Author: Koen Kooi <koen at openembedded.org>
Date:   Mon Mar  1 20:23:52 2010 +0100

qt4: adjust sed magic to recent QT to sanitize .pc files properly

---

 recipes/qt4/qt4-embedded.inc |    2 +-
 recipes/qt4/qt4-x11-free.inc |    2 +-
 recipes/qt4/qt4.inc          |    6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
index 0ffd2fa..39a5e98 100644
--- a/recipes/qt4/qt4-embedded.inc
+++ b/recipes/qt4/qt4-embedded.inc
@@ -4,7 +4,7 @@ LICENSE = "GPL QPL"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 DEPENDS += "directfb tslib"
-INC_PR = "r16"
+INC_PR = "r17"
 
 QT_BASE_NAME ?= "qt4-embedded"
 QT_BASE_LIB  ?= "libqt-embedded"
diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc
index 8879c90..fd33a21 100644
--- a/recipes/qt4/qt4-x11-free.inc
+++ b/recipes/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com"
 LICENSE = "GPL QPL"
 DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor"
 
-INC_PR = "r15"
+INC_PR = "r16"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
            file://0001-cross-compile.patch;patch=1 \
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index c98a055..b6d575d 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