Updating branch refs/heads/master
to d418dd7b8d13e7fcf2907aa452a541286e8b9723 (commit)
from 9216b46136fddcf8eea2cc06ef572c320fa990a6 (commit)
commit d418dd7b8d13e7fcf2907aa452a541286e8b9723
Author: Nick Schermer <[email protected]>
Date: Thu Aug 26 19:51:29 2010 +0200
Move xfconfd from $libexecdir to $libdir.
xfconfd/Makefile.am | 5 +++--
xfconfd/org.xfce.Xfconf.service.in | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/xfconfd/Makefile.am b/xfconfd/Makefile.am
index 1b4c1c8..505c3e9 100644
--- a/xfconfd/Makefile.am
+++ b/xfconfd/Makefile.am
@@ -1,5 +1,6 @@
-libexec_PROGRAMS = xfconfd
+xfconfddir = $(libdir)/xfce4/xfconf
+xfconfd_PROGRAMS = xfconfd
xfconf_backend_sources =
@@ -55,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,\...@libexecdir\@,$(libexecdir),g" < $< > $@
+ $(AM_V_GEN) sed -e "s,\...@libdir\@,$(libdir),g" < $< > $@
CLEANFILES = \
$(service_DATA)
diff --git a/xfconfd/org.xfce.Xfconf.service.in
b/xfconfd/org.xfce.Xfconf.service.in
index 066175f..c8fe612 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
-ex...@libexecdir@/xfconfd
+ex...@libdir@/xfce4/xfconf/xfconfd
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
