From a75616138c2074e8a5380a6de478b2837df8950f Mon Sep 17 00:00:00 2001
From: David Schneider <dnschneid@gmail.com>
Date: Tue, 14 Feb 2012 15:58:27 -0800
Subject: [PATCH] Use lib instead of libexec, and panel/plugins instead of
 panel-plugins.

---
 README                   |    4 ++--
 panel-plugin/Makefile.am |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README b/README
index 16dd87c..22d1aaf 100644
--- a/README
+++ b/README
@@ -18,10 +18,10 @@ Do the usual stuff:
 	
 You should then end up with:
         xfce4-genmon-plugin
-installed in <XFce4InstallationDir>/libexec/xfce4/panel-plugins/
+installed in <XFce4InstallationDir>/lib/xfce4/panel/plugins/
 and
         genmon.desktop
-installed in <XFce4InstallationDir>/share/xfce4/panel-plugins/
+installed in <XFce4InstallationDir>/share/xfce4/panel/plugins/
 
         xfce4-genmon-plugin.mo
 installed in <XFce4InstallationDir>/share/locale/XX/LC_MESSAGES/
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index f819ff6..38920db 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(libexecdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel/plugins
 plugin_PROGRAMS = xfce4-genmon-plugin
 
 xfce4_genmon_plugin_CFLAGS =					\
@@ -19,7 +19,7 @@ xfce4_genmon_plugin_SOURCES =	\
 
 # .desktop file
 #
-# Some automake trickery here. Because we cannot use $(libexecdir) in the
+# Some automake trickery here. Because we cannot use $(libdir) in the
 # automake stage, we'll use sed to get the full path into the .desktop file.
 # We also need to let intltool merge the translated fields, so we add an
 # additional level of indirection: a <name>.desktop.in.in file.
@@ -27,7 +27,7 @@ xfce4_genmon_plugin_SOURCES =	\
 desktop_in_in_files = genmon.desktop.in.in
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 	
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel/plugins
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
@@ -39,6 +39,6 @@ DISTCLEANFILES =							\
 	
 # get full path into .desktop file
 %.desktop.in: %.desktop.in.in
-	sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \
+	sed -e "s^@PLUGIN_PATH@^$(plugindir)^" \
 		$< > $@
 
-- 
1.7.5.4