diff --git a/Makefile.in b/Makefile.in index a98d7d201..1c51be796 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,20 +1,20 @@ all: - ninja -C build + ninja -C @BUILD_ROOT@ install: - ninja -C build install + ninja -C @BUILD_ROOT@ install uninstall: - ninja -C build uninstall + ninja -C @BUILD_ROOT@ uninstall clean: - ninja -C build clean + ninja -C @BUILD_ROOT@ clean run: all - SPA_PLUGIN_DIR=build/spa/plugins \ - PIPEWIRE_MODULE_DIR=build \ - PIPEWIRE_CONFIG_FILE=build/src/daemon/pipewire.conf \ - $(DBG) ./build/src/daemon/pipewire + SPA_PLUGIN_DIR=@BUILD_ROOT@/spa/plugins \ + PIPEWIRE_MODULE_DIR=@BUILD_ROOT@ \ + PIPEWIRE_CONFIG_FILE=@BUILD_ROOT@/src/daemon/pipewire.conf \ + $(DBG) ./@BUILD_ROOT@/src/daemon/pipewire gdb: $(MAKE) run DBG=gdb @@ -23,23 +23,23 @@ valgrind: $(MAKE) run DBG="DISABLE_RTKIT=1 valgrind" test: all - ninja -C build test + ninja -C @BUILD_ROOT@ test benchmark: all - ninja -C build benchmark + ninja -C @BUILD_ROOT@ benchmark monitor: all - SPA_PLUGIN_DIR=build/spa/plugins \ - PIPEWIRE_MODULE_DIR=build/src/modules/ \ - build/src/tools/pipewire-monitor + SPA_PLUGIN_DIR=@BUILD_ROOT@/spa/plugins \ + PIPEWIRE_MODULE_DIR=@BUILD_ROOT@/src/modules/ \ + @BUILD_ROOT@/src/tools/pipewire-monitor cli: all - SPA_PLUGIN_DIR=build/spa/plugins \ - PIPEWIRE_MODULE_DIR=build/src/modules/ \ - build/src/tools/pipewire-cli + SPA_PLUGIN_DIR=@BUILD_ROOT@/spa/plugins \ + PIPEWIRE_MODULE_DIR=@BUILD_ROOT@/src/modules/ \ + @BUILD_ROOT@/src/tools/pipewire-cli shell: all - ninja -C build uninstalled + ninja -C @BUILD_ROOT@ uninstalled dist: all git archive --prefix=pipewire-@VERSION@/ -o pipewire-@VERSION@.tar.gz @TAG@ @@ -51,8 +51,8 @@ publish: all git branch -D gh-pages 2>/dev/null || true && \ git branch -D draft 2>/dev/null || true && \ git checkout -b draft && \ - git add -f build/doc/html && \ + git add -f @BUILD_ROOT@/doc/html && \ git commit -anm "Deploy on gh-pages" && \ - git subtree split --prefix build/doc/html -b gh-pages && \ + git subtree split --prefix @BUILD_ROOT@/doc/html -b gh-pages && \ git push --force origin gh-pages:gh-pages && \ git checkout work 2>/dev/null diff --git a/meson.build b/meson.build index 2734b0d25..946b6d302 100644 --- a/meson.build +++ b/meson.build @@ -173,6 +173,7 @@ configinc = include_directories('.') pipewire_inc = include_directories('src') makedata = configuration_data() + makedata.set('BUILD_ROOT', meson.build_root()) makedata.set('VERSION', pipewire_version) if version_arr.length() == 4 makedata.set('TAG', 'HEAD')