diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-07-25 15:20:22 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-07-25 15:20:22 +0000 |
| commit | 2da13ebbe1c7ddae7c77364217bb1cbaddb8fba7 (patch) | |
| tree | 31a576184778be326be062b82e75c553db70e206 | |
| parent | 5e0430f8ebbe9cdf22423e8b2a39c5efe9dd301e (diff) | |
| parent | af3fdf9495476b000ff6b50e8c3b8e15fa1ff422 (diff) | |
merge of '16117855ab79f990564455eee9d420e472e6ab44'
and 'a4e4bdd6c9f1532c72e89559a85e2a3c12d161b5'
| -rw-r--r-- | packages/webkit/webkit_svn.bb | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/packages/webkit/webkit_svn.bb b/packages/webkit/webkit_svn.bb index 10884a3dca..c5f5dcafa7 100644 --- 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" |