From f15da0f10890467712222410233c0bec9faefdd0 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 1 Jul 2020 10:52:10 +1000 Subject: [PATCH] meson.build: don't install the quirks in a further 'quirks' subdirectory install_subdir() by default also copies the 'quirks' directory, resulting in the quirks files being in /libinput/quirks/*.quirks as opposed to the previous /libinput/*.quirks. Fixes 727dc44b045974699be53d07464867d3183c6eef Signed-off-by: Peter Hutterer --- meson.build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index eeb73be5..4ae5c9a3 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ project('libinput', 'c', version : '1.15.900', license : 'MIT/Expat', default_options : [ 'c_std=gnu99', 'warning_level=2' ], - meson_version : '>= 0.41.0') + meson_version : '>= 0.45.0') libinput_version = meson.project_version().split('.') @@ -310,7 +310,8 @@ config_h.set_quoted('LIBINPUT_QUIRKS_OVERRIDE_FILE', libinput_data_override_path config_h.set_quoted('LIBINPUT_QUIRKS_SRCDIR', dir_src_quirks) install_subdir('quirks', exclude_files: ['README.md'], - install_dir : dir_data) + install_dir : dir_data, + strip_directory : true) src_libquirks = [ 'src/quirks.c',