frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: use absolute paths in manpage substitutions 

paths returned by get_option('foodir') are potentially relative to prefix

Noticed when comparing manpages generated by a meson build with those
generated by an autotools build

Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Jon Turney 2018-06-30 12:53:35 +01:00 committed by Peter Hutterer
parent 38ff29ec8e
commit 49283e238a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@ -520,9 +520,9 @@ manpage_config.set('libmansuffix', '3')
manpage_config.set('miscmansuffix', '7') manpage_config.set('miscmansuffix', '7')
manpage_config.set('filemansuffix', '5') manpage_config.set('filemansuffix', '5')
manpage_config.set('logdir', log_dir) manpage_config.set('logdir', log_dir)
manpage_config.set('datadir', get_option('datadir')) manpage_config.set('datadir', join_paths(get_option('prefix'), get_option('datadir')))
manpage_config.set('mandir', get_option('mandir')) manpage_config.set('mandir', join_paths(get_option('prefix'), get_option('mandir')))
manpage_config.set('sysconfdir', get_option('sysconfdir')) manpage_config.set('sysconfdir', join_paths(get_option('prefix'), get_option('sysconfdir')))
manpage_config.set('xconfigdir', 'xorg.conf.d') manpage_config.set('xconfigdir', 'xorg.conf.d')
manpage_config.set('xkbdir', xkb_dir) manpage_config.set('xkbdir', xkb_dir)
manpage_config.set('XKB_DFLT_RULES', get_option('xkb_default_rules')) manpage_config.set('XKB_DFLT_RULES', get_option('xkb_default_rules'))