system/pipewire
system/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire synced 2024-07-05 17:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix paths used in 'make run'.

Browse Source 
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
This commit is contained in:
Andres Freund 2020-12-06 12:38:01 -08:00 committed by Wim Taymans
parent 78e7a45e6e
commit 1e89e7559b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.in
View File

@ -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:

1
meson.build
View File

@ -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')