diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2018-05-04 15:09:22 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-05-07 12:23:34 -0400 |
| commit | 1a3e4a2f6722048c5c7c4c1a9d6748e68a895a3e (patch) | |
| tree | 403250d3781e0963619ad7b4b6dcf0fc77fff733 | |
| parent | 1dcd784a677c58e77c368a676fd9dbd3159db94f (diff) | |
meson: Define DEFAULT_LIBRARY_PATH as join_paths(get_option('prefix'), get_option('libdir'))
'libdir' defaults to 'lib', so running X -showDefaultLibPath just prints 'lib'
instead of '/usr/lib' or '/usr/local/lib'. Use joint_paths() to get the correct
full path.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
| -rw-r--r-- | include/meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/meson.build b/include/meson.build index 691e9f074..50ea1c3ba 100644 --- a/include/meson.build +++ b/include/meson.build @@ -316,7 +316,7 @@ xorg_data.set_quoted('DEFAULT_LOGDIR', log_dir) xorg_data.set_quoted('DEFAULT_LOGPREFIX', 'Xorg.') xorg_data.set_quoted('FALLBACK_INPUT_DRIVER', 'libinput') xorg_data.set_quoted('DEFAULT_MODULE_PATH', join_paths(get_option('prefix'), module_dir)) -xorg_data.set_quoted('DEFAULT_LIBRARY_PATH', get_option('libdir')) +xorg_data.set_quoted('DEFAULT_LIBRARY_PATH', join_paths(get_option('prefix'), get_option('libdir'))) xorg_data.set_quoted('__XSERVERNAME__', 'Xorg') xorg_data.set('XSERVER_LIBPCIACCESS', get_option('pciaccess')) xorg_data.set_quoted('PCI_TXT_IDS_PATH', '') |