Updating branch refs/heads/master to 3cd8ae19d1ea83d0c24795e4da1cc25ebefefab3 (commit) from 840a689fdf6d9402ec79e66a429f18ec90f4c28d (commit)
commit 3cd8ae19d1ea83d0c24795e4da1cc25ebefefab3 Author: Guido Berhoerster <g...@opensuse.org> Date: Sat Feb 12 17:41:59 2011 +0100 Allow installation of the helpers in a custom location. 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 d6652ac..365e934 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 _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits