[Xfce4-commits] <exo:master> Allow installation of the helpers in a custom location.

[Nick Schermer]

Updating branch refs/heads/master
         to 2ba9a13eb477232ec984622a1aec9bc024898c77 (commit)
       from acc27174635e14f63d5b4143d8a3775f01a54c0d (commit)

commit 2ba9a13eb477232ec984622a1aec9bc024898c77
Author: Guido Berhoerster <gber at opensuse.org>
Date:   Sat Feb 12 17:19:38 2011 +0100

    Allow installation of the helpers in a custom location.

 configure.in.in                          |   10 ++++++++++
 exo-gio-module/Makefile.am               |    2 +-
 exo-gio-module/exo-module.c              |    2 +-
 exo-helper/Makefile.am                   |    4 ++--
 exo-helper/exo-preferred-applications.in |    2 +-
 exo-helper/helpers/Makefile.am           |    4 ++--
 exo/Makefile.am                          |    2 +-
 exo/exo-execute.c                        |    2 +-
 8 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 677f80a..f3e2574 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -59,6 +59,16 @@ AC_SUBST([LIBEXO_VERSION_MAJOR])
 AC_SUBST([LIBEXO_VERSION_MINOR])
 AC_SUBST([LIBEXO_VERSION_MICRO])
 
+dnl ******************************
+dnl *** Set helper path prefix ***
+dnl ******************************
+AC_ARG_WITH([helper-path-prefix],
+            [AC_HELP_STRING([--with-helper-path-prefix=PATH],
+                            [Path prefix under which helper executables will be installed (default: $libdir)])],
+            [HELPER_PATH_PREFIX="$withval"],
+            [HELPER_PATH_PREFIX="$libdir"])
+AC_SUBST([HELPER_PATH_PREFIX])
+
 dnl *******************************
 dnl *** Check for UNIX variants ***
 dnl *******************************
diff --git a/exo-gio-module/Makefile.am b/exo-gio-module/Makefile.am
index bdcee93..b0a9946 100644
--- a/exo-gio-module/Makefile.am
+++ b/exo-gio-module/Makefile.am
@@ -2,7 +2,7 @@
 INCLUDES = 								\
 	-I$(top_srcdir)							\
 	-DG_LOG_DOMAIN=\"exo-gio-module\"				\
-	-DLIBDIR=\"$(libdir)/xfce4/exo-$(LIBEXO_VERSION_API)\"		\
+	-DHELPERDIR=\"$(HELPER_PATH_PREFIX)/xfce4/exo-$(LIBEXO_VERSION_API)\"	\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
 	-DLIBEXO_VERSION_API=\"$(LIBEXO_VERSION_API)\"
 
diff --git a/exo-gio-module/exo-module.c b/exo-gio-module/exo-module.c
index 3e76411..ebf8ef9 100644
--- a/exo-gio-module/exo-module.c
+++ b/exo-gio-module/exo-module.c
@@ -24,7 +24,7 @@
 #include <gio/gio.h>
 #include <gio/gdesktopappinfo.h>
 
-#define EXO_HELPER_LAUNCH LIBDIR G_DIR_SEPARATOR_S "exo-helper-" LIBEXO_VERSION_API " --launch "
+#define EXO_HELPER_LAUNCH HELPERDIR G_DIR_SEPARATOR_S "exo-helper-" LIBEXO_VERSION_API " --launch "
 
 
 
diff --git a/exo-helper/Makefile.am b/exo-helper/Makefile.am
index 407a49a..af7dd45 100644
--- a/exo-helper/Makefile.am
+++ b/exo-helper/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = 								\
 	-DG_LOG_DOMAIN=\"exo-helper\"					\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
 
-exo_helperdir = $(libdir)/xfce4/exo-$(LIBEXO_VERSION_API)
+exo_helperdir = $(HELPER_PATH_PREFIX)/xfce4/exo-$(LIBEXO_VERSION_API)
 
 exo_helper_PROGRAMS = \
 	exo-helper-1
@@ -53,7 +53,7 @@ bin_SCRIPTS =								\
 	exo-preferred-applications
 
 exo-preferred-applications: Makefile $(srcdir)/exo-preferred-applications.in
-	sed -e 's, at libdir\@,$(libdir),g' 				\
+	sed -e 's, at HELPERDIR\@,$(HELPER_PATH_PREFIX)/xfce4/exo-$(LIBEXO_VERSION_API),g' \
 	    -e 's, at LIBEXO_VERSION_API\@,$(LIBEXO_VERSION_API),g' 	\
 	    < $(srcdir)/exo-preferred-applications.in			\
 	    > exo-preferred-applications
diff --git a/exo-helper/exo-preferred-applications.in b/exo-helper/exo-preferred-applications.in
index d2054b0..ce857bd 100644
--- a/exo-helper/exo-preferred-applications.in
+++ b/exo-helper/exo-preferred-applications.in
@@ -8,4 +8,4 @@
 # Browser, Mail Reader and Terminal Emulator.
 #
 
-exec @libdir@/xfce4/exo- at LIBEXO_VERSION_API@/exo-helper- at LIBEXO_VERSION_API@ --configure "$@"
+exec @HELPERDIR@/exo-helper- at LIBEXO_VERSION_API@ --configure "$@"
diff --git a/exo-helper/helpers/Makefile.am b/exo-helper/helpers/Makefile.am
index 9df603e..052ed2f 100644
--- a/exo-helper/helpers/Makefile.am
+++ b/exo-helper/helpers/Makefile.am
@@ -41,10 +41,10 @@ desktop_in_in_files =							\
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 %.desktop.in: %.desktop.in.in
-	sed -e 's,\@HELPERDIR\@,$(libdir)/xfce4/exo-$(LIBEXO_VERSION_API),g' < $< > $@
+	sed -e 's,\@HELPERDIR\@,$(HELPER_PATH_PREFIX)/xfce4/exo-$(LIBEXO_VERSION_API),g' < $< > $@
 @INTLTOOL_DESKTOP_RULE@
 
-exo_composedir = $(libdir)/xfce4/exo-$(LIBEXO_VERSION_API)
+exo_composedir = $(HELPER_PATH_PREFIX)/xfce4/exo-$(LIBEXO_VERSION_API)
 exo_compose_SCRIPTS =							\
 	exo-compose-mail-$(LIBEXO_VERSION_API)
 
diff --git a/exo/Makefile.am b/exo/Makefile.am
index 2fcfce2..46c3790 100644
--- a/exo/Makefile.am
+++ b/exo/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = 								\
 	-DDATADIR=\"$(datadir)\"					\
 	-DEXO_COMPILATION						\
 	-DG_LOG_DOMAIN=\"exo\"						\
-	-DLIBDIR=\"$(libdir)/xfce4/exo-$(LIBEXO_VERSION_API)\"		\
+	-DHELPERDIR=\"$(HELPER_PATH_PREFIX)/xfce4/exo-$(LIBEXO_VERSION_API)\"	\
 	-DLIBEXO_VERSION_API=\"$(LIBEXO_VERSION_API)\"			\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
 
diff --git a/exo/exo-execute.c b/exo/exo-execute.c
index 6ffd33c..0ac750d 100644
--- a/exo/exo-execute.c
+++ b/exo/exo-execute.c
@@ -131,7 +131,7 @@ exo_execute_preferred_application_on_screen (const gchar *category,
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
   /* generate the argument vector */
-  argv[argc++] = LIBDIR G_DIR_SEPARATOR_S "exo-helper-" LIBEXO_VERSION_API;
+  argv[argc++] = HELPERDIR G_DIR_SEPARATOR_S "exo-helper-" LIBEXO_VERSION_API;
   argv[argc++] = "--launch";
   argv[argc++] = (gchar *) category;