webkit: add some qmake magic from zecke to make install and staging work better

diff --git a/packages/webkit/webkit_svn.bb b/packages/webkit/webkit_svn.bb
index 10884a3..c5f5dca 100644 (file)
--- a/packages/webkit/webkit_svn.bb
+++ b/packages/webkit/webkit_svn.bb
@@ -27,7 +27,7 @@ do_configure_append() {
         qmake2 -spec ${QMAKESPEC} CONFIG+=gdk-port CONFIG-=qt CONFIG-=release CONFIG+=debug
        mkdir -p WebKitBuilds/Debug
        cd WebKitBuilds/Debug
-       PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro
+       PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro WEBKIT_INC_DIR=${prefix}/include WEBKIT_LIB_DIR=${libdir}
 }
 
 do_compile_prepend() {
@@ -44,11 +44,20 @@ do_install() {
        install -d ${D}${libdir}/pkgconfig
 
        install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GdkLauncher/GdkLauncher ${D}${bindir}
-       cp -pPR WebKitBuilds/Debug/lib/*.so* ${D}${libdir} 
-       cp -pPR WebKitBuilds/Debug/lib/*.pc ${D}${libdir}/pkgconfig/ || true
+        cd ${S}/WebKitBuilds/Debug
+       PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir}
+        oe_runmake install
 }
 
 
+do_stage() {
+        install -d ${STAGING_LIBDIR}
+        install -d ${STAGING_INCDIR}
+        cd ${S}/WebKitBuilds/Debug
+       PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR}
+        oe_runmake install
+}
+
 PACKAGES =+ "webkit-gdklauncher-dbg webkit-gdklauncher"
 
 FILES_webkit-gdklauncher = "${bindir}/GdkLauncher"