summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2018-06-29 14:30:16 +0100
committerJon Turney <jon.turney@dronecode.org.uk>2018-08-28 18:57:22 +0100
commitf8366e96542a6448beb8d142dc32aec4a3704126 (patch)
tree5cb135eccda434b86df50056ec19aa6d78bf7e00
parent9ce7aef02dc5893a2ea82c190f7762f22339597e (diff)
meson: use absolute paths in manpage substitutions
paths returned by get_option('foodir') are potentially relative to prefix
-rw-r--r--meson.build6
1 files changed, 3 insertions, 3 deletions
diff --git a/meson.build b/meson.build
index 92380dfc9..057d91312 100644
--- a/meson.build
+++ b/meson.build
@@ -518,9 +518,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'))