From aa06f8bdece497539921a28b42e0b69a1df190df Mon Sep 17 00:00:00 2001 From: Michel Dänzer Date: Mon, 15 Mar 2021 17:30:24 +0100 Subject: meson: Make sure XKM_OUTPUT_DIR has a trailing slash RunXkbComp passes an invalid file path to xkbcomp if there's no trailing slash. Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1146 Suggested-by: Dylan Baker (cherry picked from commit 6c51818a0f55282cbe5a870f58ca82ca45ee472d) --- include/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/meson.build b/include/meson.build index 5042f2bb4..d3f2db840 100644 --- a/include/meson.build +++ b/include/meson.build @@ -285,7 +285,7 @@ xkb_data.set_quoted('XKB_DFLT_MODEL', get_option('xkb_default_model')) xkb_data.set_quoted('XKB_DFLT_LAYOUT', get_option('xkb_default_layout')) xkb_data.set_quoted('XKB_DFLT_VARIANT', get_option('xkb_default_variant')) xkb_data.set_quoted('XKB_DFLT_OPTIONS', get_option('xkb_default_options')) -xkb_data.set_quoted('XKM_OUTPUT_DIR', xkb_output_dir) +xkb_data.set_quoted('XKM_OUTPUT_DIR', xkb_output_dir + '/') configure_file(output : 'xkb-config.h', configuration : xkb_data) -- cgit v1.2.3