xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/meson.build |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit a3931ec6f43857aeed7feac5d223d7db6728145e
Author: Povilas Kanapickas <povilas at radix.lt>
Date:   Thu Mar 25 22:46:33 2021 +0200

    xfree86: Create a symlink X -> Xorg when installing using meson
    
    This brings the behavior closer than what we currently have with
    autotools-based build system.
    
    Meson does not currently have native support for symlinks.
    See https://github.com/mesonbuild/meson/issues/1602.
    
    Signed-off-by: Povilas Kanapickas <povilas at radix.lt>

diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index a6311cb12..b1b5920a5 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -138,6 +138,12 @@ if get_option('xf86-input-inputtest')
     subdir('drivers/inputtest')
 endif
 
+meson.add_install_script(
+    'sh', '-c',
+    'ln -fs Xorg @0@@1@'.format(
+        '${DESTDIR}',
+        join_paths(get_option('prefix'), get_option('bindir'), 'X')))
+
 if get_option('suid_wrapper')
     executable('Xorg.wrap',
         'xorg-wrapper.c',