[Xfce4-commits] <xfce4-embed-plugin:master> Install plugin to lib instead of libexec.

[David Schneider]

Updating branch refs/heads/master
         to df30dc4092cd9c97fa5b4a68fc5d5e0dd2ea97fa (commit)
       from dc994c65d675b4a00288bd70355731e8117db8a4 (commit)

commit df30dc4092cd9c97fa5b4a68fc5d5e0dd2ea97fa
Author: David Schneider <dnschneid at gmail.com>
Date:   Sun Feb 5 12:22:15 2012 -0800

    Install plugin to lib instead of libexec.

 panel-plugin/Makefile.am         |    6 +++---
 panel-plugin/embed.desktop.in.in |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 1476008..f194f81 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -11,7 +11,7 @@ plugin_PROGRAMS = \
 	xfce4-embed-plugin
 
 plugindir = \
-	$(libexecdir)/xfce4/panel-plugins
+	$(libdir)/xfce4/panel/plugins
 
 xfce4_embed_plugin_SOURCES = \
 	embed.c \
@@ -38,7 +38,7 @@ xfce4_embed_plugin_LDADD = \
 # Desktop file
 #
 desktopdir =								\
-	$(datadir)/xfce4/panel-plugins
+	$(datadir)/xfce4/panel/plugins
 
 desktop_in_in_files =							\
 	embed.desktop.in.in
@@ -47,7 +47,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/embed.desktop.in.in b/panel-plugin/embed.desktop.in.in
index ad48bd7..f7bc5fe 100644
--- a/panel-plugin/embed.desktop.in.in
+++ b/panel-plugin/embed.desktop.in.in
@@ -4,4 +4,4 @@ Encoding=UTF-8
 _Name=Embed Plugin
 _Comment=Embeds an arbitrary window into the panel
 Icon=xfce4-panel
-X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/xfce4-embed-plugin
+X-XFCE-Exec=@libdir@/xfce4/panel/plugins/xfce4-embed-plugin