diff options
| -rw-r--r-- | include/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 5 | ||||
| -rw-r--r-- | meson_options.txt | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/include/meson.build b/include/meson.build index 90f8de3cb..5d746eb70 100644 --- a/include/meson.build +++ b/include/meson.build @@ -219,7 +219,7 @@ configure_file(output : 'version-config.h', xkb_data = configuration_data() -xkb_data.set_quoted('XKB_BIN_DIRECTORY', join_paths(get_option('prefix'), get_option('bindir'))) +xkb_data.set_quoted('XKB_BIN_DIRECTORY', xkb_bin_dir) xkb_data.set_quoted('XKB_BASE_DIRECTORY', xkb_dir) xkb_data.set_quoted('XKB_DFLT_RULES', get_option('xkb_default_rules')) xkb_data.set_quoted('XKB_DFLT_MODEL', get_option('xkb_default_model')) diff --git a/meson.build b/meson.build index d71cfed5a..f9b21b36c 100644 --- a/meson.build +++ b/meson.build @@ -107,6 +107,11 @@ if xkb_output_dir == '' xkb_output_dir = join_paths(get_option('prefix'), 'share/X11/xkb/compiled') endif +xkb_bin_dir = get_option('xkb_bin_dir') +if xkb_bin_dir == '' + xkb_bin_dir = join_paths(get_option('prefix'), get_option('bindir')) +endif + hal_option = get_option('hal') glamor_option = get_option('glamor') diff --git a/meson_options.txt b/meson_options.txt index b1ee6ccc5..1954ea7a0 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -29,6 +29,7 @@ option('ipv6', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto') option('xkb_dir', type: 'string') option('xkb_output_dir', type: 'string') +option('xkb_bin_dir', type: 'string') option('xkb_default_rules', type: 'string', value: 'evdev') option('xkb_default_model', type: 'string', value: 'pc105') option('xkb_default_layout', type: 'string', value: 'us') |