Commit 465b38ca authored by Thierry Reding's avatar Thierry Reding Committed by Adam Jackson

meson: Fix generation of xorg-server.pc

Meson stores relative paths for includedir, libdir and friends. These
have to be concatenated with the ${prefix} or ${exec_prefix} variables
to create a working pkg-config file.

While at it, set a default value for the module_dir option so that it
points to the same location as used in the autotools-based build.
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Reviewed-by: Adam Jackson's avatarAdam Jackson <ajax@redhat.com>
parent d905e333
......@@ -592,13 +592,13 @@ if build_xorg
awk = find_program('awk')
sdkconfig.set('prefix', get_option('prefix'))
sdkconfig.set('exec_prefix', get_option('prefix'))
sdkconfig.set('libdir', get_option('libdir'))
sdkconfig.set('includedir', get_option('includedir'))
sdkconfig.set('datarootdir', get_option('datadir'))
sdkconfig.set('moduledir', get_option('module_dir'))
sdkconfig.set('sdkdir', join_paths(get_option('includedir'), 'include'))
sdkconfig.set('sysconfigdir', join_paths(get_option('datadir'), 'X11/xorg.conf.d'))
sdkconfig.set('exec_prefix', '${prefix}')
sdkconfig.set('libdir', join_paths('${exec_prefix}', get_option('libdir')))
sdkconfig.set('includedir', join_paths('${prefix}', get_option('includedir')))
sdkconfig.set('datarootdir', join_paths('${prefix}', get_option('datadir')))
sdkconfig.set('moduledir', join_paths('${exec_prefix}', get_option('module_dir')))
sdkconfig.set('sdkdir', join_paths('${prefix}', get_option('includedir'), 'xorg'))
sdkconfig.set('sysconfigdir', join_paths('${datarootdir}', 'X11/xorg.conf.d'))
sdkconfig.set('abi_ansic',
run_command(awk, '-F', '[(,)]',
......
......@@ -19,7 +19,7 @@ option('builder_addr', type: 'string', description: 'Builder address', value: 'x
option('builder_string', type: 'string', description: 'Additional builder string')
option('log_dir', type: 'string')
option('module_dir', type: 'string',
option('module_dir', type: 'string', value: 'xorg/modules',
description: 'X.Org modules directory')
option('default_font_path', type: 'string')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment