summaryrefslogtreecommitdiff
path: root/meson_options.txt
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2018-03-28 14:04:37 +0200
committerAdam Jackson <ajax@redhat.com>2018-03-28 09:54:26 -0400
commit465b38cadd573ce50eca959f4b56bf4a6a638d91 (patch)
treeaa76cd5527b52bbc3e248a1e3f53bc2fb3071a08 /meson_options.txt
parentd905e3330fd4f9b15a0277b22d608705787cb8bc (diff)
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>
Diffstat (limited to 'meson_options.txt')
-rw-r--r--meson_options.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/meson_options.txt b/meson_options.txt
index ce1ae80bd..5c7be0e26 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -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')