From e92d0acd1d87267fd2057aab79ccc4a01032b64f Mon Sep 17 00:00:00 2001
From: aviau <alexandre@alexandreviau.net>
Date: Sat, 26 Mar 2016 21:25:26 -0400
Subject: [PATCH] move dring to ${prefix}/sbin
${prefix}/libexec is not part of the FHS. Moving to ${prefix}/sbin to
accomodate distros
See https://lists.debian.org/debian-devel/2005/05/msg00401.html
Change-Id: I9b2911929a2f8cc2c8f624c56b6491883c71b6a8
Tuleap: #350
---
bin/Makefile.am | 6 +++---
bin/dbus/cx.ring.Ring.service.in | 2 +-
configure.ac | 3 ---
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 1d30d435c4..9366c7a716 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,5 +1,5 @@
if HAVE_WIN32
-libexec_PROGRAMS = ringcli
+bin_PROGRAMS = ringcli
ringcli_SOURCES = winmain.cpp
ringcli_CXXFLAGS = -I$(top_srcdir)/src \
-I$(top_srcdir)/src/dring \
@@ -8,7 +8,7 @@ ringcli_LDADD = $(top_builddir)/src/libring.la
endif
if HAVE_OSX
-libexec_PROGRAMS = ringcli
+bin_PROGRAMS = ringcli
ringcli_SOURCES = osxmain.cpp
ringcli_CXXFLAGS = -I$(top_srcdir)/src \
-I$(top_srcdir)/src/dring \
@@ -19,7 +19,7 @@ endif
if RING_DBUS
SUBDIRS=dbus
-libexec_PROGRAMS = dring
+sbin_PROGRAMS = dring
dring_SOURCES = main.cpp
diff --git a/bin/dbus/cx.ring.Ring.service.in b/bin/dbus/cx.ring.Ring.service.in
index 253b6798bb..4e27a6422e 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=@LIBEXECDIR@/dring
+Exec=/usr/sbin/dring
diff --git a/configure.ac b/configure.ac
index e85cbd6f3d..6ed5735366 100644
--- a/configure.ac
+++ b/configure.ac
@@ -366,9 +366,6 @@ 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(LIBEXECDIR, $libexecdir)
- AC_SUBST(LIBEXECDIR)
-
AC_CONFIG_FILES([bin/dbus/Makefile
bin/dbus/cx.ring.Ring.service])
--
GitLab