From f6556ec7d126b31da37c08d7cb657250505e01a0 Mon Sep 17 00:00:00 2001 From: Sergii Romantsov Date: Thu, 21 Feb 2019 10:28:11 +0200 Subject: dri: meson: do not prefix user provided dri-drivers-path The user can select the location where there dri drivers are installed by the dri-drivers-path meson option. By default path will be $prefix/$libdir/dri. Currently we add $prefix to the user provided path. Resulting in an incorrect or even missing path. v2: fixed dri_search_path by default, rebased to master v3: new commit-message (Emil Velikov), cc mesa-stable Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109698 CC: Rafael Antognolli CC: Dylan Baker Cc: 18.3 19.0 Fixes: 306914db92e1 (meson: Add dridriverdir variable to dri.pc.) Signed-off-by: Sergii Romantsov Reviewed-by: Emil Velikov --- meson.build | 4 ++-- src/mesa/drivers/dri/meson.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 44bc2f7c2a4..8cac9f676dd 100644 --- a/meson.build +++ b/meson.build @@ -61,11 +61,11 @@ endif dri_drivers_path = get_option('dri-drivers-path') if dri_drivers_path == '' - dri_drivers_path = join_paths(get_option('libdir'), 'dri') + dri_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'dri') endif dri_search_path = get_option('dri-search-path') if dri_search_path == '' - dri_search_path = join_paths(get_option('prefix'), dri_drivers_path) + dri_search_path = dri_drivers_path endif with_gles1 = get_option('gles1') diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build index d98c823f5fe..0410a5a12ec 100644 --- a/src/mesa/drivers/dri/meson.build +++ b/src/mesa/drivers/dri/meson.build @@ -78,7 +78,7 @@ if with_dri filebase : 'dri', description : 'Direct Rendering Infrastructure', version : meson.project_version(), - variables : ['dridriverdir=${prefix}/' + dri_drivers_path], + variables : ['dridriverdir=' + dri_drivers_path], requires_private : dri_req_private, ) endif -- cgit v1.2.3