diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-06-30 12:53:35 +0100 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2018-07-02 09:35:19 +1000 |
| commit | 49283e238a0ba6051034ae635e5970891f17f9df (patch) | |
| tree | 73078da921df82c1760ca2aa78e1196866f58b13 | |
| parent | 38ff29ec8ead0a293f50ac52146199babe4205ca (diff) | |
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>
| -rw-r--r-- | meson.build | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meson.build b/meson.build index 650018c29..cd1e4a58c 100644 --- a/meson.build +++ b/meson.build @@ -520,9 +520,9 @@ manpage_config.set('libmansuffix', '3') manpage_config.set('miscmansuffix', '7') manpage_config.set('filemansuffix', '5') manpage_config.set('logdir', log_dir) -manpage_config.set('datadir', get_option('datadir')) -manpage_config.set('mandir', get_option('mandir')) -manpage_config.set('sysconfdir', get_option('sysconfdir')) +manpage_config.set('datadir', join_paths(get_option('prefix'), get_option('datadir'))) +manpage_config.set('mandir', join_paths(get_option('prefix'), get_option('mandir'))) +manpage_config.set('sysconfdir', join_paths(get_option('prefix'), get_option('sysconfdir'))) manpage_config.set('xconfigdir', 'xorg.conf.d') manpage_config.set('xkbdir', xkb_dir) manpage_config.set('XKB_DFLT_RULES', get_option('xkb_default_rules')) |