xserver: Branch 'master'

[GitLab Mirror]

 meson.build |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0839b0523a01067cb9c9b53ebdd9ce4c00f0eb12
Author: E5ten <ethancsommer at gmail.com>
Date:   Wed Jan 15 17:36:06 2020 +0000

    meson: add prefix to serverconfigdir
    
    fixes #853

diff --git a/meson.build b/meson.build
index 7b14e2807..82942bd94 100644
--- a/meson.build
+++ b/meson.build
@@ -643,7 +643,7 @@ glx_inc = include_directories('glx')
 
 top_dir_inc = include_directories('.')
 
-serverconfigdir = join_paths(get_option('libdir'), 'xorg')
+serverconfigdir = join_paths(get_option('prefix'), get_option('libdir'), 'xorg')
 
 manpage_config = configuration_data()
 manpage_config.set('vendorversion', '"xorg-server @0@" "X Version 11"'.format(meson.project_version()))