summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan McDowell <noodles@earth.li>2005-11-08 08:53:57 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-11-08 08:53:57 +0000
commitddfdc42ce0e9c07226c1a6390b03e5df4e731902 (patch)
tree7d77a3225b5c100ab3a013b2dac62eb40ad77682
parenta2152bdfee1555f88de7645e77bb9fb6ad6d5ca3 (diff)
parente33d9cbbffe963c4dd3ebf22bd7b1989cddef191 (diff)
merge of 153be4736bf674fd8330fb369cf0a2a6ad382473
and 839ec3f42960c632240a938d522021359a9c136d
-rw-r--r--packages/gnome/gconf-dbus_cvs.bb10
1 files changed, 5 insertions, 5 deletions
diff --git a/packages/gnome/gconf-dbus_cvs.bb b/packages/gnome/gconf-dbus_cvs.bb
index a02138aad8..cf326d255a 100644
--- a/packages/gnome/gconf-dbus_cvs.bb
+++ b/packages/gnome/gconf-dbus_cvs.bb
@@ -8,18 +8,16 @@ RPROVIDES_${PN} = "gconf"
RPROVIDES_${PN}-dev = "gconf-dev"
PV = "0.0cvs${CVSDATE}"
-PR = "r7"
+PR = "r8"
SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gconf;tag=gconf-dbus-2-6 \
file://gconf-dbus-update.patch;patch=1;pnum=0 \
file://69gconfd-dbus"
-FILES_${PN} += " ${libdir}/GConf/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus-1"
-
+inherit pkgconfig autotools
S = "${WORKDIR}/gconf"
-
-inherit pkgconfig autotools
+FILES_${PN} += " ${libdir}/GConf/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*"
EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static"
@@ -35,4 +33,6 @@ do_stage() {
do_install_append () {
install -d ${D}/${sysconfdir}/X11/Xsession.d
install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/
+ install -d ${D}/${datadir}/dbus-1.0/services/
+ install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/
}