From 3d5cee55d8bb385f07820dba49725892dbedd72e Mon Sep 17 00:00:00 2001 From: George Kiagiadakis Date: Wed, 28 Feb 2024 12:39:06 +0200 Subject: [PATCH] meson: install configuration files back in $wireplumber_data_dir --- meson.build | 1 - src/config/meson.build | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index e7e98300..7fa3b0ab 100644 --- a/meson.build +++ b/meson.build @@ -19,7 +19,6 @@ wireplumber_data_dir = get_option('prefix') / get_option('datadir') / 'wireplumb wireplumber_config_dir = get_option('prefix') / get_option('sysconfdir') / 'wireplumber' wireplumber_locale_dir = get_option('prefix') / get_option('localedir') wireplumber_doc_dir = get_option('prefix') / get_option('datadir') / 'doc' / 'wireplumber' -pipewire_data_dir = get_option('prefix') / get_option('datadir') / 'pipewire' cc = meson.get_compiler('c') diff --git a/src/config/meson.build b/src/config/meson.build index b71e00ce..322e2c30 100644 --- a/src/config/meson.build +++ b/src/config/meson.build @@ -1,5 +1,5 @@ -install_data('wireplumber.conf', install_dir : pipewire_data_dir) -install_subdir('wireplumber.conf.d', install_dir : pipewire_data_dir) +install_data('wireplumber.conf', install_dir : wireplumber_data_dir) +install_subdir('wireplumber.conf.d', install_dir : wireplumber_data_dir) install_subdir('wireplumber.conf.d.examples', install_dir : wireplumber_doc_dir / 'examples' / 'wireplumber.conf.d', strip_directory : true,