Merge branch 'devel' into 'master'

Entry test added to -devel package See merge request Librem5/squeekboard!286
2019-12-23 21:33:41 +00:00
parent 6b72d09fb8 1cffdda09d
commit ca8a2baefa
7 changed files with 27 additions and 15 deletions
--- a/meson.build
+++ b/meson.build
@ -40,6 +40,7 @@ else
 endif

 prefix = get_option('prefix')
+bindir = join_paths(prefix, get_option('bindir'))
 datadir = join_paths(prefix, get_option('datadir'))
 pkgdatadir = join_paths(datadir, meson.project_name())
 if get_option('depdatadir') == ''
@ -67,4 +68,5 @@ subdir('data')
 subdir('protocols')
 subdir('eek')
 subdir('src')
+subdir('tools')
 subdir('tests')