diff options
| author | Olivier Fourdan <ofourdan@redhat.com> | 2024-04-17 15:59:44 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-04-17 15:20:05 +0000 |
| commit | 41c3155fdf71cd17d374f0e0a4fdf2830a354f04 (patch) | |
| tree | 27b04327ca525305a40fa12954c7b558889d9009 | |
| parent | 8ff88ffec9fc3d842b54f6a90cffda752cab3e40 (diff) | |
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>
| -rw-r--r-- | hw/xwayland/meson.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build index bca6a899a..458f3c09e 100644 --- a/hw/xwayland/meson.build +++ b/hw/xwayland/meson.build @@ -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', |