xwayland: Use exec name instead of hardcoding '/Xwayland'

Use the target name instead of hardcoding the 'Xwayland' executable
name, along with the / operator.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1490>
This commit is contained in:
Olivier Fourdan 2024-04-17 15:59:44 +02:00 committed by Marge Bot
parent 8ff88ffec9
commit 41c3155fdf

View File

@ -184,7 +184,7 @@ pkgconfig.generate(
description: 'X Server for Wayland',
variables: [
'exec_prefix=${prefix}',
'xwayland=' + xwayland_path + '/Xwayland',
'xwayland=' + xwayland_path / xwayland_server.name(),
] + xwayland_vars,
)
@ -196,7 +196,7 @@ xwayland_manpage = configure_file(
install_man(xwayland_manpage)
desktop_data = configuration_data()
desktop_data.set('XWAYLAND', xwayland_path + '/Xwayland'))
desktop_data.set('XWAYLAND', xwayland_path / xwayland_server.name())
desktop_data.set('DECORATE', have_libdecor ? '-decorate' : '')
desktop_file = configure_file(
input: 'desktop/org.freedesktop.Xwayland.desktop.in',