andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Thierry Reding <treding@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Thierry Reding 2018-03-28 14:04:37 +02:00 committed by Adam Jackson
parent d905e3330f
commit 465b38cadd
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
meson.build
View File

@ -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', '[(,)]',

2
meson_options.txt
View File

@ -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')