summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2017-09-28 13:59:04 -0700
committerDylan Baker <dylan@pnwbakers.com>2017-10-09 13:42:44 -0700
commitdb9788420d4bc7b4a61eab38c0093af94274d00d (patch)
treeba8f7410552fa5103526c06f56313d0af99a57f1 /src
parenta47c525f3281a2753180e076c7e9b7772aff8f06 (diff)
meson: Add support for configuring dri drivers directory.
v2: - drop with_ from dri_drivers_path variable (Eric A) v3: - Move HAVE_X11_PLATFORM to the proper patch (Eric A) Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com> Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src')
-rw-r--r--src/glx/meson.build2
-rw-r--r--src/mesa/drivers/dri/meson.build2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/glx/meson.build b/src/glx/meson.build
index 70718df4d35..6853f5b3a16 100644
--- a/src/glx/meson.build
+++ b/src/glx/meson.build
@@ -106,7 +106,7 @@ elif with_windowsdri
#]
endif
-dri_driver_dir = join_paths(get_option('prefix'), get_option('libdir'), 'dri')
+dri_driver_dir = join_paths(get_option('prefix'), dri_drivers_path)
if not with_glvnd
gl_lib_name = 'GL'
gl_lib_version = '1.2.0'
diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build
index fc851e8a6b4..9e0e9638aa4 100644
--- a/src/mesa/drivers/dri/meson.build
+++ b/src/mesa/drivers/dri/meson.build
@@ -49,7 +49,7 @@ if with_dri
meson.add_install_script(
join_paths(meson.source_root(), 'bin/install_megadrivers.py'),
libmesa_dri_drivers.full_path(),
- join_paths(get_option('libdir'), 'dri'),
+ dri_drivers_path,
dri_link,
)
endif