diff options
author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-12-13 12:14:01 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-12-13 12:14:01 +0000 |
commit | 704fafa6aaeb82cf39068fc80decd8dfac31a9e6 (patch) | |
tree | ee68b1b75b8c2b6fe6a669ed1f6f6179d6704556 | |
parent | 19711ba264ecf5b93f70f73896608aca29cadeef (diff) | |
parent | a7dd97057e4ff21b76276f1c89123e02dab97faf (diff) |
merge of '091511591b5d369f5f183c5300585f7f1b3ca830'
and '91d52cdc54af4a2802967cfdab32c81d01922351'
-rw-r--r-- | classes/scons.bbclass | 1 | ||||
-rw-r--r-- | packages/gnome/gconf-dbus_svn.bb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/classes/scons.bbclass b/classes/scons.bbclass index 534b3bd4c7..6d0a783dc2 100644 --- a/classes/scons.bbclass +++ b/classes/scons.bbclass @@ -6,6 +6,7 @@ scons_do_compile() { } scons_do_install() { + install -d ${D}${prefix} ${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} prefix=${D}${prefix} install || \ oefatal "scons install execution failed." } diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb index cc69079c3a..e7875dc72e 100644 --- a/packages/gnome/gconf-dbus_svn.bb +++ b/packages/gnome/gconf-dbus_svn.bb @@ -7,7 +7,7 @@ RPROVIDES_${PN} = "gconf" RPROVIDES_${PN}-dev = "gconf-dev" PV = "2.16.0+svnr${SRCREV}" -PR = "r4" +PR = "r5" SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \ file://69gconfd-dbus" @@ -19,6 +19,7 @@ PARALLEL_MAKE = "" FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*" FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug" +FILES_${PN}-dev += "${libdir}/GConf-dbus/2/*.la ${datadir}/sgml/gconf/gconf-1.0.dtd" EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static" |