[Xfce4-commits] <xfconf:xfce-4.8> Allow installation of the helpers in a custom location.

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
         to 66256cd753152ab7632654996843ef10b257b713 (commit)
       from 98d7172cd548497322478caf8f8b2534e0868bb7 (commit)

commit 66256cd753152ab7632654996843ef10b257b713
Author: Guido Berhoerster <gber at opensuse.org>
Date:   Sat Feb 12 17:41:59 2011 +0100

    Allow installation of the helpers in a custom location.
    
    (cherry picked from commit 3cd8ae19d1ea83d0c24795e4da1cc25ebefefab3)

 configure.ac.in                    |    8 ++++++++
 xfconfd/Makefile.am                |    4 ++--
 xfconfd/org.xfce.Xfconf.service.in |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 4a1ea7d..6d851b0 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -28,6 +28,14 @@ AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
+dnl set helper path prefix
+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 check for UNIX variants
 AC_AIX
 AC_ISC_POSIX
diff --git a/xfconfd/Makefile.am b/xfconfd/Makefile.am
index 505c3e9..7becaf5 100644
--- a/xfconfd/Makefile.am
+++ b/xfconfd/Makefile.am
@@ -1,5 +1,5 @@
 
-xfconfddir = $(libdir)/xfce4/xfconf
+xfconfddir = $(HELPER_PATH_PREFIX)/xfce4/xfconf
 xfconfd_PROGRAMS = xfconfd
 
 xfconf_backend_sources =
@@ -56,7 +56,7 @@ service_in_files = org.xfce.Xfconf.service.in
 service_DATA = $(service_in_files:.service.in=.service)
 
 %.service: %.service.in
-	$(AM_V_GEN) sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
+	$(AM_V_GEN) sed -e "s,\@HELPERDIR\@,$(HELPER_PATH_PREFIX),g" < $< > $@
 
 CLEANFILES = \
 	$(service_DATA)
diff --git a/xfconfd/org.xfce.Xfconf.service.in b/xfconfd/org.xfce.Xfconf.service.in
index c8fe612..58f6680 100644
--- a/xfconfd/org.xfce.Xfconf.service.in
+++ b/xfconfd/org.xfce.Xfconf.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.xfce.Xfconf
-Exec=@libdir@/xfce4/xfconf/xfconfd
+Exec=@HELPERDIR@/xfce4/xfconf/xfconfd