From ede255b8f6b9c21c17cd74b654e550b9704874fa Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 23 May 2020 18:23:01 +0200 Subject: meson: Allow for libdir and includedir to be absolute paths Meson allows to use absolute paths for libdir and includedir [0]. But if they're absolute paths one must not append the prefix. The join_paths() function [1] nicely supports both relative and absolute paths. This is e.g. important for Nixpkgs (i.e. Nix(OS)) where binaries and library files are usually installed under different prefixes. [0]: https://github.com/mesonbuild/meson/commit/a513bcfde613f2a0403f7b0cd34d4bd62674c1d8 [1]: https://mesonbuild.com/Reference-manual.html#join_paths Signed-off-by: Michael Weiss --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index c5963b1..32c8358 100644 --- a/meson.build +++ b/meson.build @@ -65,7 +65,7 @@ libva_lt_version = '@0@.@1@.@2@'.format(libva_lt_current, driverdir = get_option('driverdir') if driverdir == '' - driverdir = '@0@/@1@/@2@'.format(get_option('prefix'), get_option('libdir'), 'dri') + driverdir = join_paths(get_option('prefix'), get_option('libdir'), 'dri') endif configinc = include_directories('.') -- cgit v1.2.1