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>
This commit is contained in:
parent
1dcd784a67
commit
1a3e4a2f67
|
@ -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', '')
|
||||
|
|
Loading…
Reference in New Issue
Block a user