summaryrefslogtreecommitdiff
path: root/packages/xfce
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-06-30 22:07:04 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-06-30 22:07:04 +0000
commitd4f7af436d07c7bc4dd61ac45bff3414a1c12c74 (patch)
tree049f5903fea26153466932a6b271c49f10b75ba8 /packages/xfce
parent873ce28c40814edb45f534003450318c6e9b2650 (diff)
parent7339a83b4095582728045cee92aa215373607caf (diff)
merge of '08199c52a592fe71e2675200cf618a439d710884'
and '3e5f187370604cf4577025ebc49d90ca52a72d4d'
Diffstat (limited to 'packages/xfce')
-rw-r--r--packages/xfce/xfce4-panel.inc3
-rw-r--r--packages/xfce/xfdesktop.inc4
-rw-r--r--packages/xfce/xfwm4.inc4
3 files changed, 5 insertions, 6 deletions
diff --git a/packages/xfce/xfce4-panel.inc b/packages/xfce/xfce4-panel.inc
index dbd1baef60..6ad71fcf82 100644
--- a/packages/xfce/xfce4-panel.inc
+++ b/packages/xfce/xfce4-panel.inc
@@ -20,6 +20,7 @@ do_install() {
}
PACKAGES += "${PN}-plugins ${PN}-mcs-plugins"
-FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so*"
+FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so* \
+ ${datadir}/xfce4/panel-plugins/*.desktop"
FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/"
FILES_${PN}-dbg += "${libdir}/xfce4/mcs-plugins/.debug"
diff --git a/packages/xfce/xfdesktop.inc b/packages/xfce/xfdesktop.inc
index 50a4f488cc..bd5bb7223c 100644
--- a/packages/xfce/xfdesktop.inc
+++ b/packages/xfce/xfdesktop.inc
@@ -11,5 +11,7 @@ PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins"
FILES_xfdesktop-backdrops="${datadir}/xfce4/backdrops/*"
FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so"
-FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so"
+FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so \
+ ${libdir}/xfce4/panel-plugins/xfce4-menu-plugin \
+ ${datadir}/xfce4/panel-plugins/*.desktop"
FILES_${PN}-dbg += "/usr/libexec/xfce4/panel-plugins/.debug"
diff --git a/packages/xfce/xfwm4.inc b/packages/xfce/xfwm4.inc
index e7e5bc1862..e443a841ae 100644
--- a/packages/xfce/xfwm4.inc
+++ b/packages/xfce/xfwm4.inc
@@ -14,10 +14,6 @@ RDEPENDS = "xfwm4-theme-default"
EXTRA_OECONF += " --enable-startup-notification"
-do_configure_append() {
- sed -i s:/usr/include/xfce4::g mcs-plugin/Makefile
-}
-
PACKAGES_DYNAMIC = "xfwm4-theme-*"
python populate_packages_prepend () {