From 6c51818a0f55282cbe5a870f58ca82ca45ee472d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Fri, 5 Mar 2021 15:23:53 +0100 Subject: [PATCH] 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 --- include/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/meson.build b/include/meson.build index f764f1547..270d2f397 100644 --- a/include/meson.build +++ b/include/meson.build @@ -339,7 +339,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)