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

[Nick Schermer]

Updating branch refs/heads/master
         to 839e217e0262094e25bc03fac87d34540d4cfdab (commit)
       from 676be4b16d97aaecaebd79156853915f3435c5e9 (commit)

commit 839e217e0262094e25bc03fac87d34540d4cfdab
Author: Guido Berhoerster <gber at opensuse.org>
Date:   Sat Feb 12 17:41:09 2011 +0100

    Allow installation of the helpers in a custom location.

 configure.in.in                         |    9 +++++++++
 scripts/Makefile.am                     |    4 ++--
 scripts/xfconf-migration-4.6.desktop.in |    2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 387423a..86835d0 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -26,6 +26,15 @@ 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/scripts/Makefile.am b/scripts/Makefile.am
index 54b6b8f..6ce290c 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -49,7 +49,7 @@ conffiles_DATA=\
 
 if XFCONF_MIGRATION
 
-migrationscriptdir = $(libdir)/xfce4/xfconf-migration
+migrationscriptdir = $(HELPER_PATH_PREFIX)/xfce4/xfconf-migration
 migrationscript_in_files = xfconf-migration-4.6.pl.in
 migrationscript_SCRIPTS = $(migrationscript_in_files:.pl.in=.pl)
 
@@ -61,7 +61,7 @@ autostart_in_files = xfconf-migration-4.6.desktop.in
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 
 xfconf-migration-4.6.desktop: $(srcdir)/xfconf-migration-4.6.desktop.in
-	sed 's,\@libdir\@,$(libdir),' < $< > $@
+	sed 's,\@HELPERDIR\@,$(HELPER_PATH_PREFIX),' < $< > $@
 
 endif
 
diff --git a/scripts/xfconf-migration-4.6.desktop.in b/scripts/xfconf-migration-4.6.desktop.in
index 2211ab8..4a707e2 100644
--- a/scripts/xfconf-migration-4.6.desktop.in
+++ b/scripts/xfconf-migration-4.6.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Name=Xfconf Migration Script
-Exec=@libdir@/xfce4/xfconf-migration/xfconf-migration-4.6.pl
+Exec=@HELPERDIR@/xfce4/xfconf-migration/xfconf-migration-4.6.pl
 Terminal=false
 Type=Application
 StartupNotify=false