diff options
Diffstat (limited to 'meta/recipes-qt/qt4/qt4.inc')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 5545be700a..7f3e1a4785 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -293,7 +293,6 @@ do_install() { -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#I/usr/include#Iincludedir}#g' \ -e 's#Iin#I${in#g' \ ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc @@ -310,8 +309,7 @@ do_install() { # QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so manually fix it up here: for pc in ${D}${libdir}/pkgconfig/*.pc ; do - sed -i -e "s:prefix}include/${QT_BASE_NAME}/$(basename $pc .pc):prefix}/include:" \ - -e "s,Cflags: ,Cflags: -IP{includedir}/${QT_BASE_NAME}/$(basename $pc .pc) ," \ + sed -i -e "s:prefix}include/${QT_DIR_NAME}/$(basename $pc .pc):prefix}/include:" \ -e 's:IP{:I${:g' $pc done |