Skip to content

Commit 192f1ba

Browse files
David Herrmannteg
authored andcommitted
launch: use $bindir to spawn dbus-broker
Rather than hard-coding /usr/bin/, lets use $bindir. You can still override it via --broker=, but the default should now be sufficient. Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
1 parent 28b926d commit 192f1ba

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ project(
1010

1111
add_project_arguments('-D_GNU_SOURCE', language: 'c')
1212
add_project_arguments('-DPACKAGE_VERSION=' + meson.project_version(), language: 'c')
13+
add_project_arguments('-DBINDIR="' + join_paths(get_option('prefix'), get_option('bindir')) + '"', language: 'c')
1314

1415
cc = meson.get_compiler('c')
1516
conf = configuration_data()

src/launch/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ struct Manager {
5050
uint64_t service_ids;
5151
};
5252

53-
static const char * main_arg_broker = "/usr/bin/dbus-broker";
53+
static const char * main_arg_broker = BINDIR "/dbus-broker";
5454
static bool main_arg_force = false;
5555
static const char * main_arg_listen = NULL;
5656
static const char * main_arg_scope = "system";

0 commit comments

Comments
 (0)