summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <mdaenzer@redhat.com>2021-03-05 15:23:53 +0100
committerMichel Dänzer <michel@daenzer.net>2021-03-15 16:53:46 +0100
commit6c51818a0f55282cbe5a870f58ca82ca45ee472d (patch)
tree497a2d0a5403a103930ca9aaf9d36696516c460e
parent376eaadde36f80fcbe6b0391a3385e77b4602854 (diff)
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 <dylan.c.baker@intel.com>
-rw-r--r--include/meson.build2
1 files changed, 1 insertions, 1 deletions
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)