diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2021-03-15 17:30:24 +0100 |
|---|---|---|
| committer | Michel Dänzer <mdaenzer@redhat.com> | 2021-03-15 17:30:24 +0100 |
| commit | aa06f8bdece497539921a28b42e0b69a1df190df (patch) | |
| tree | 27acaf4789fdebf7fae329ec84a6236da6492231 | |
| parent | a8581795ed540797d47ba0bcad58f4a6cdaf1a7c (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>
(cherry picked from commit 6c51818a0f55282cbe5a870f58ca82ca45ee472d)
| -rw-r--r-- | include/meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
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) |