diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-10-18 16:35:01 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-10-18 16:35:01 +0000 |
| commit | 2b94d96062ac7eb6a15445f74e424b7b08e69a63 (patch) | |
| tree | a4ceb58e4985908f2dd574d498e1e17f38061f5e /packages/webkit/webkit-gtk_svn.bb | |
| parent | 51d88fa521229df09a9d624618d7e861d765d21a (diff) | |
| parent | 0ed630ee92d26828b61f1de72dc0b33d2a056123 (diff) | |
merge of '1d0e13e8c6528e7a7037276e3c01cb21dfa085e4'
and '86581f7de9bc72fe5e21778b4442cc0e59e96fbf'
Diffstat (limited to 'packages/webkit/webkit-gtk_svn.bb')
| -rw-r--r-- | packages/webkit/webkit-gtk_svn.bb | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb index 077baec95e..208ec25719 100644 --- a/packages/webkit/webkit-gtk_svn.bb +++ b/packages/webkit/webkit-gtk_svn.bb @@ -23,10 +23,10 @@ SRC_URI = "\ S = "${WORKDIR}/" do_configure() { - qmake2 -spec ${QMAKESPEC} CONFIG+=gdk-port CONFIG-=qt CONFIG-=release CONFIG+=debug + qmake2 -spec ${QMAKESPEC} CONFIG+=gtk-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+=gtk-port $PWD/../../WebKit.pro \ WEBKIT_INC_DIR=${prefix}/include WEBKIT_LIB_DIR=${libdir} } @@ -43,9 +43,9 @@ do_install() { install -d ${D}${libdir} install -d ${D}${libdir}/pkgconfig - install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GdkLauncher/GdkLauncher ${D}${bindir} + install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GtkLauncher/GtkLauncher ${D}${bindir} cd ${S}/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+=gtk-port $PWD/../../WebKit.pro \ WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir} oe_runmake install } @@ -54,12 +54,13 @@ 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 \ + PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gtk-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" -FILES_webkit-gdklauncher-dbg = "${bindir}/.debug/GdkLauncher" +PACKAGES =+ "webkit-gtklauncher-dbg webkit-gtklauncher" + +FILES_webkit-gtklauncher = "${bindir}/GtkLauncher" +FILES_webkit-gtklauncher-dbg = "${bindir}/.debug/GtkLauncher" |