From 1e89e7559bd195ec7145a3e2c616597f8cec5925 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Sun, 6 Dec 2020 12:38:01 -0800 Subject: [PATCH] Fix paths used in 'make run'. In particular ACP_PATHS_DIR, ACP_PROFILES_DIR ended up pointing to the build directory, despite only existing in the source directory. I also adjusted PIPEWIRE_CONFIG_DIR to be explicit about referencing the build directory, given that the other environment variables are doing so. Fixes: #448 --- Makefile.in | 6 +++--- meson.build | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 35ac90e35..aca03a44e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,9 +15,9 @@ run: all PIPEWIRE_MODULE_DIR=@BUILD_ROOT@ \ PATH=@BUILD_ROOT@/src/examples:$(PATH) \ PIPEWIRE_CONFIG_FILE=@BUILD_ROOT@/src/daemon/pipewire-uninstalled.conf \ - PIPEWIRE_CONFIG_DIR=src/daemon/ \ - ACP_PATHS_DIR=spa/plugins/alsa/mixer/paths \ - ACP_PROFILES_DIR=spa/plugins/alsa/mixer/profile-sets \ + PIPEWIRE_CONFIG_DIR=@BUILD_ROOT@/src/daemon/ \ + ACP_PATHS_DIR=@SOURCE_ROOT@/spa/plugins/alsa/mixer/paths \ + ACP_PROFILES_DIR=@SOURCE_ROOT@/spa/plugins/alsa/mixer/profile-sets \ $(DBG) @BUILD_ROOT@/src/daemon/pipewire gdb: diff --git a/meson.build b/meson.build index 0073eb138..ec02ef314 100644 --- a/meson.build +++ b/meson.build @@ -306,6 +306,7 @@ pipewire_inc = include_directories('src') makedata = configuration_data() makedata.set('BUILD_ROOT', meson.build_root()) + makedata.set('SOURCE_ROOT', meson.source_root()) makedata.set('VERSION', pipewire_version) if version_arr.length() == 4 makedata.set('TAG', 'HEAD')