[Xfce4-commits] <xfce4-panel:master> Move helpers applications to $libdir.

[Nick Schermer]

Updating branch refs/heads/master
         to fa611018403071097cdbfad05bc741e34e31086f (commit)
       from 417a3ad4f69a6edff013b4ffb5298fe9e1a93b3b (commit)

commit fa611018403071097cdbfad05bc741e34e31086f
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Aug 26 18:18:21 2010 +0200

    Move helpers applications to $libdir.
    
    FHS 2.3 forbids files in $libexecdir, so move those files to $libdir.

 migrate/Makefile.am                   |    2 +-
 panel/Makefile.am                     |    1 -
 panel/panel-application.c             |    2 +-
 panel/panel-plugin-external-wrapper.c |    2 +-
 wrapper/Makefile.am                   |    2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/migrate/Makefile.am b/migrate/Makefile.am
index e4a0c69..168c221 100644
--- a/migrate/Makefile.am
+++ b/migrate/Makefile.am
@@ -10,7 +10,7 @@ confdir = $(sysconfdir)/xdg/xfce4/panel
 conf_DATA = \
 	default.xml
 
-migratedir = $(libexecdir)/xfce4/panel
+migratedir = $(libdir)/xfce4/panel
 
 migrate_PROGRAMS = \
 	migrate
diff --git a/panel/Makefile.am b/panel/Makefile.am
index 4adb915..60f3a9d 100644
--- a/panel/Makefile.am
+++ b/panel/Makefile.am
@@ -4,7 +4,6 @@ INCLUDES = \
 	-DG_LOG_DOMAIN=\"xfce4-panel\" \
 	-DDATADIR=\"$(datadir)/xfce4\" \
 	-DLIBDIR=\"$(libdir)/xfce4\" \
-	-DLIBEXECDIR=\"$(libexecdir)/xfce4\" \
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
 	-DDBUS_API_SUBJECT_TO_CHANGE \
 	$(PLATFORM_CPPFLAGS)
diff --git a/panel/panel-application.c b/panel/panel-application.c
index e3e059f..f264a24 100644
--- a/panel/panel-application.c
+++ b/panel/panel-application.c
@@ -50,7 +50,7 @@
 #include <panel/panel-plugin-external.h>
 
 #define AUTOSAVE_INTERVAL (10 * 60)
-#define MIGRATE_BIN       LIBEXECDIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "migrate"
+#define MIGRATE_BIN       LIBDIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "migrate"
 
 
 
diff --git a/panel/panel-plugin-external-wrapper.c b/panel/panel-plugin-external-wrapper.c
index daf3153..93cfb1e 100644
--- a/panel/panel-plugin-external-wrapper.c
+++ b/panel/panel-plugin-external-wrapper.c
@@ -51,7 +51,7 @@
 
 
 
-#define WRAPPER_BIN LIBEXECDIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "wrapper"
+#define WRAPPER_BIN LIBDIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "wrapper"
 
 
 
diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am
index 7263dcd..fd60c2d 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = \
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
 	$(PLATFORM_CPPFLAGS)
 
-wrapperdir = $(libexecdir)/xfce4/panel
+wrapperdir = $(libdir)/xfce4/panel
 
 wrapper_PROGRAMS = \
 	wrapper