From dbfedc6172c3359a7fc59c38934e0aed853479af Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Thu, 9 Apr 2020 11:22:09 +0200 Subject: [PATCH] install missing gmidimonitor.ui MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Rework gmidimonitor_datadir meaning: default is /usr/share/gmidimonitor Signed-off-by: Andreas Müller --- meson.build | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index e6f5550..879c1b4 100644 --- a/meson.build +++ b/meson.build @@ -23,9 +23,9 @@ endif # define paths gmidimonitor_prefix = get_option('prefix') gmidimonitor_bindir = join_paths(gmidimonitor_prefix, get_option('bindir')) -gmidimonitor_datadir = join_paths(gmidimonitor_prefix, get_option('datadir')) -gmidimonitor_desktopdir = join_paths(gmidimonitor_datadir, 'applications') -gmidimonitor_pixmapsdir = join_paths(gmidimonitor_datadir, 'pixmaps') +gmidimonitor_datadir = join_paths(gmidimonitor_prefix, get_option('datadir') / meson.project_name()) +gmidimonitor_desktopdir = join_paths(get_option('datadir'), 'applications') +gmidimonitor_pixmapsdir = join_paths(get_option('datadir'), 'pixmaps') # configure.h conf_data = configuration_data() @@ -36,8 +36,6 @@ configure_file(input : 'config.h.in', output : 'config.h', configuration : conf_data) -#cc = meson.get_compiler('c') - # sources src = [ 'main.c', @@ -66,6 +64,9 @@ executable( install : true ) +# additional installs +install_data('gmidimonitor.ui') + message('') message('==================') message('Prefix: ' + gmidimonitor_prefix) -- 2.11.4.GIT