From 781b6ebbc6f8438952cec5e3a6bcd91b1bbbf0d2 Mon Sep 17 00:00:00 2001 From: Christoph J. Thompson Date: Tue, 11 Jan 2011 12:30:16 +0100 Subject: [PATCH 2/2] Change the installation location of the plug-in to the appropriate new place (libexec->lib). modified: panel-plugin/Makefile.am modified: panel-plugin/systemload.desktop.in.in --- 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 a271a82..752fa87 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 @@ -44,7 +44,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 -- 1.7.1