Commit 63462a0c authored by aviau's avatar aviau Committed by gerrit2

Move dring to $(LIBDIR)/ring/dring

In reaction to Debian bug:
 - https://bugs.debian.org/831978

Accoding to the FHS[1]:
  Utilities used for system administration (and other root-only
  commands) are stored in /sbin, /usr/sbin, and /usr/local/sbin. /sbin
  contains binaries essential for booting, restoring, recovering, and/or
  repairing the system in addition to the binaries in /bin. [18]
  Programs executed after /usr is known to be mounted (when there are no
  problems) are generally placed into /usr/sbin. Locally-installed
  system administration programs should be placed into
  /usr/local/sbin.

1. https://www.debian.org/doc/packaging-manuals/fhs/fhs-2.3.html#SBINSYSTEMBINARIES

Change-Id: I13e16eb0e7750fc84d5f44c53da63ad0aebbe240
Tuleap: #860
parent 65f7fffb
ringlibdir = $(libdir)/ring
if HAVE_WIN32
bin_PROGRAMS = ringcli
ringlib_PROGRAMS = ringcli
ringcli_SOURCES = winmain.cpp
ringcli_CXXFLAGS = -I$(top_srcdir)/src \
-I$(top_srcdir)/src/dring \
......@@ -8,7 +10,7 @@ ringcli_LDADD = $(top_builddir)/src/libring.la
endif
if HAVE_OSX
bin_PROGRAMS = ringcli
ringlib_PROGRAMS = ringcli
ringcli_SOURCES = osxmain.cpp
ringcli_CXXFLAGS = -I$(top_srcdir)/src \
-I$(top_srcdir)/src/dring \
......@@ -19,7 +21,7 @@ endif
if RING_DBUS
SUBDIRS=dbus
sbin_PROGRAMS = dring
ringlib_PROGRAMS = dring
dring_SOURCES = main.cpp
......
[D-BUS Service]
Name=cx.ring.Ring
Exec=@SBINDIR@/dring
Exec=@LIBDIR@/ring/dring
......@@ -367,8 +367,8 @@ 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)
AS_AC_EXPAND(LIBDIR, $libdir)
AC_SUBST(LIBDIR)
AC_CONFIG_FILES([bin/dbus/Makefile
bin/dbus/cx.ring.Ring.service])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment