summaryrefslogtreecommitdiff
path: root/xfconfd
diff options
context:
space:
mode:
authorGuido Berhoerster <gber@opensuse.org>2011-02-12 17:41:59 +0100
committerNick Schermer <nick@xfce.org>2011-02-12 17:41:59 +0100
commit3cd8ae19d1ea83d0c24795e4da1cc25ebefefab3 (patch)
treef45b2a3ff7541228ac247d70b8c5d05fc590b76c /xfconfd
parent840a689fdf6d9402ec79e66a429f18ec90f4c28d (diff)
downloadxfconf-3cd8ae19d1ea83d0c24795e4da1cc25ebefefab3.tar.gz
Allow installation of the helpers in a custom location.
Diffstat (limited to 'xfconfd')
-rw-r--r--xfconfd/Makefile.am4
-rw-r--r--xfconfd/org.xfce.Xfconf.service.in2
2 files changed, 3 insertions, 3 deletions
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