Updating branch refs/heads/master
to 608e7087b8ee461dd6e8b823df4595cac568499d (commit)
from 97694efd28d30261f120fb7be61b54e6beb8e5da (commit)
commit 608e7087b8ee461dd6e8b823df4595cac568499d
Author: cjsthompson <[email protected]>
Date: Sun Feb 5 12:20:42 2012 -0800
Bug 7077: Install plugin to lib instead of libexec.
panel-plugin/Makefile.am | 4 ++--
panel-plugin/systemload.desktop.in.in | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index f58f1e8..9396445 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES =
\
$(PLATFORM_CPPFLAGS)
plugindir = \
- $(libexecdir)/xfce4/panel-plugins
+ $(libdir)/xfce4/panel/plugins
plugin_PROGRAMS = \
xfce4-systemload-plugin
@@ -46,7 +46,7 @@ desktop_in_files =
\
$(desktop_in_in_files:.desktop.in.in=.desktop.in)
%.desktop.in: %.desktop.in.in
- sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
+ sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
desktop_DATA = \
$(desktop_in_files:.desktop.in=.desktop)
diff --git a/panel-plugin/systemload.desktop.in.in
b/panel-plugin/systemload.desktop.in.in
index b79b605..74d4bfa 100644
--- a/panel-plugin/systemload.desktop.in.in
+++ b/panel-plugin/systemload.desktop.in.in
@@ -4,5 +4,5 @@ Encoding=UTF-8
_Name=System Load Monitor
_Comment=Monitor CPU load, swap usage and memory footprint
Icon=utilities-system-monitor
-X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/xfce4-systemload-plugin
+X-XFCE-Exec=@libdir@/xfce4/panel/plugins/xfce4-systemload-plugin
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
