From af2f3a1055e35f2ee25600cd4d8f40430361907b Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Sat, 27 Jun 2020 14:02:32 +0200 Subject: [PATCH] build: Install daemon in libexecdir Rather than sbindir, which would have meant it could be in the PATH. --- data/iio-sensor-proxy.service.in | 2 +- data/meson.build | 2 +- meson.build | 2 +- src/meson.build | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/iio-sensor-proxy.service.in b/data/iio-sensor-proxy.service.in index 3704d68..4bc921b 100644 --- a/data/iio-sensor-proxy.service.in +++ b/data/iio-sensor-proxy.service.in @@ -4,7 +4,7 @@ Description=IIO Sensor Proxy service [Service] Type=dbus BusName=net.hadess.SensorProxy -ExecStart=@sbindir@/iio-sensor-proxy +ExecStart=@libexecdir@/iio-sensor-proxy #Uncomment this to enable debug #Environment="G_MESSAGES_DEBUG=all" diff --git a/data/meson.build b/data/meson.build index 814638c..e188221 100644 --- a/data/meson.build +++ b/data/meson.build @@ -4,7 +4,7 @@ install_data( ) data_conf = configuration_data() -data_conf.set('sbindir', sbindir) +data_conf.set('libexecdir', libexecdir) data_conf.set('geoclue_user', get_option('geoclue-user')) configure_file( diff --git a/meson.build b/meson.build index 1d91908..61420f9 100644 --- a/meson.build +++ b/meson.build @@ -23,7 +23,7 @@ common_cflags = cc.get_supported_arguments([ '-Wshadow' ]) -sbindir = get_option('sbindir') +libexecdir = get_option('libexecdir') bindir = get_option('bindir') dbusconfdir = get_option('sysconfdir') / 'dbus-1' / 'system.d' diff --git a/src/meson.build b/src/meson.build index 3060a24..f916890 100644 --- a/src/meson.build +++ b/src/meson.build @@ -32,7 +32,7 @@ executable('iio-sensor-proxy', sources, dependencies: deps, install: true, - install_dir: sbindir + install_dir: libexecdir ) executable('fake-input-accelerometer',