From 9635709f50086b7fb26e4fa009a373f63374e5a7 Mon Sep 17 00:00:00 2001
From: aviau <alexandre@alexandreviau.net>
Date: Fri, 22 Apr 2016 13:39:07 -0400
Subject: [PATCH] dbus service file: use substitution variable
The subsitution variable is needed for installing in other prefixes
than /usr. Otherwise, the dbus service file won't point to the right
installation directory.
Change-Id: If46688c9963cd69a931ffa4f6efc43cccbcff90c
Tuleap: #594
---
bin/dbus/cx.ring.Ring.service.in | 2 +-
configure.ac | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/bin/dbus/cx.ring.Ring.service.in b/bin/dbus/cx.ring.Ring.service.in
index 4e27a6422e..b7acab7bb3 100644
--- a/bin/dbus/cx.ring.Ring.service.in
+++ b/bin/dbus/cx.ring.Ring.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=cx.ring.Ring
-Exec=/usr/sbin/dring
+Exec=@SBINDIR@/dring
diff --git a/configure.ac b/configure.ac
index 6ed5735366..fb53b8100f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -366,6 +366,9 @@ AC_ARG_WITH([dbus],
AS_IF([test "x$with_dbus" = "xyes"], [
PKG_CHECK_MODULES(DBUSCPP, dbus-c++-1,, AC_MSG_WARN([Missing dbus development files]))
+ AS_AC_EXPAND(SBINDIR, $sbindir)
+ AC_SUBST(SBINDIR)
+
AC_CONFIG_FILES([bin/dbus/Makefile
bin/dbus/cx.ring.Ring.service])
--
GitLab