From 87a1e1534c52f62c29cf9c982efd67dfc5760ace Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 13 Oct 2021 10:04:39 +1000 Subject: [PATCH] daemon: let meson handle the uninstalled media-session path If we build media-session before the daemon we have the executable variable available and can rely on meson to fill in the path instead of handling it manually. --- src/daemon/meson.build | 3 +-- src/meson.build | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/daemon/meson.build b/src/daemon/meson.build index 9adbb7784..fcab47d0f 100644 --- a/src/daemon/meson.build +++ b/src/daemon/meson.build @@ -40,8 +40,7 @@ endif if default_sm == '' summary({'No session manager': 'pw-uninstalled.sh will not work out of the box!'}) elif default_sm == 'media-session' - conf_config_uninstalled.set('session_manager_path', - meson.build_root() / 'src' / 'media-session' / 'pipewire-media-session') + conf_config_uninstalled.set('session_manager_path', pipewire_media_session.full_path()) conf_config_uninstalled.set('sm_comment', '') elif default_sm == 'wireplumber' wp_bindir = wp_proj.get_variable('wireplumber_bin_dir', pipewire_bindir) diff --git a/src/meson.build b/src/meson.build index ee083f319..1e45830d8 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,9 +1,9 @@ subdir('pipewire') +subdir('media-session') subdir('daemon') subdir('tools') subdir('modules') -subdir('media-session') if not get_option('examples').disabled() subdir('examples') endif