From 6a07d0ec9c16e9fadb73f003667f4d3d5695bedd Mon Sep 17 00:00:00 2001
From: Matthias Bach <marix@marix.org>
Date: Fri, 27 Jul 2018 22:59:22 +0200
Subject: [PATCH] build: install ratbagd into sbindir

Ratbagd requires to be run by root. It should thus live in the system binary
directory.
---
 dbus/org.freedesktop.ratbag1.service.in |  2 +-
 meson.build                             | 39 +++++++++++++++----------
 ratbagd/ratbagd.service.in              |  2 +-
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/dbus/org.freedesktop.ratbag1.service.in b/dbus/org.freedesktop.ratbag1.service.in
index aaa3b56a..6569ead0 100644
--- a/dbus/org.freedesktop.ratbag1.service.in
+++ b/dbus/org.freedesktop.ratbag1.service.in
@@ -1,5 +1,5 @@
 [D-BUS Service]
 Name=org.freedesktop.ratbag1
-Exec=@bindir@/ratbagd
+Exec=@sbindir@/ratbagd
 User=root
 SystemdService=ratbagd.service
diff --git a/meson.build b/meson.build
index 6e7f244a..b644547b 100644
--- a/meson.build
+++ b/meson.build
@@ -399,11 +399,13 @@ deps_ratbagd = [
 	dep_unistring,
 ]
 
-executable('ratbagd',
-	   src_ratbagd,
-	   dependencies : deps_ratbagd,
-	   include_directories : include_directories('src'),
-	   install : true,
+executable(
+  'ratbagd',
+  src_ratbagd,
+  dependencies : deps_ratbagd,
+  include_directories : include_directories('src'),
+  install : true,
+  install_dir : get_option('sbindir'),
 )
 
 install_man('ratbagd/ratbagd.8')
@@ -462,14 +464,19 @@ if enable_systemd
 	endif
 endif
 
-config_bindir = configuration_data()
-config_bindir.set('bindir', join_paths(get_option('prefix'), get_option('bindir')))
+config_sbindir = configuration_data()
+config_sbindir.set(
+  'sbindir',
+  join_paths(get_option('prefix'), get_option('sbindir')),
+)
 
 if enable_systemd
-	configure_file(input : 'ratbagd/ratbagd.service.in',
-			output : 'ratbagd.service',
-			configuration : config_bindir,
-			install_dir : unitdir)
+  configure_file(
+    input : 'ratbagd/ratbagd.service.in',
+    output : 'ratbagd.service',
+    configuration : config_sbindir,
+    install_dir : unitdir,
+  )
 endif
 
 dbusdir = get_option('dbus-root-dir')
@@ -477,10 +484,12 @@ if dbusdir == ''
 	dbusdir = join_paths(get_option('prefix'), get_option('datadir'), 'dbus-1')
 endif
 
-configure_file(input : 'dbus/org.freedesktop.ratbag1.service.in',
-	       output : 'org.freedesktop.ratbag1.service',
-	       configuration : config_bindir,
-	       install_dir : join_paths(dbusdir, 'system-services'))
+configure_file(
+  input : 'dbus/org.freedesktop.ratbag1.service.in',
+  output : 'org.freedesktop.ratbag1.service',
+  configuration : config_sbindir,
+  install_dir : join_paths(dbusdir, 'system-services')
+)
 
 dbusgroup = get_option('dbus-group')
 if dbusgroup == ''
diff --git a/ratbagd/ratbagd.service.in b/ratbagd/ratbagd.service.in
index e6f6eb9f..4ce2e00b 100644
--- a/ratbagd/ratbagd.service.in
+++ b/ratbagd/ratbagd.service.in
@@ -4,7 +4,7 @@ Description=Daemon to introspect and modify configurable mice
 [Service]
 Type=dbus
 BusName=org.freedesktop.ratbag1
-ExecStart=@bindir@/ratbagd
+ExecStart=@sbindir@/ratbagd
 Restart=on-abort
 
 [Install]