From 1e2034c9e3aef2b1eaeb2a622d5a59a956fb13f4 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Tue, 11 Dec 2018 13:35:00 +0100 Subject: Update poi_firejail.desktop --- src/meson.build | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'src/meson.build') diff --git a/src/meson.build b/src/meson.build index 2243887..0ad0166 100644 --- a/src/meson.build +++ b/src/meson.build @@ -51,19 +51,22 @@ poi = executable(get_option('poiName'), install: true, # install .desktop file and firejail profile for systems in this array if ['linux'].contains(host_machine.system()) - conf = configuration_data() - conf.set('exec_poi', join_paths(get_option('prefix'), get_option('bindir'), get_option('poiName'))) - conf.set('profile_path', join_paths(get_option('prefix'), get_option('libdir'), 'smolbote', 'poi.profile')) + conf = configuration_data({ + 'exec_poi': get_option('prefix') / get_option('bindir') / get_option('poiName'), + 'firejail': get_option('firejail'), + 'firejail_profile': get_option('prefix') / get_option('libdir') / 'smolbote/poi.profile' + }) # application icon - install_data('../data/poi.svg', install_dir: join_paths(get_option('datadir'), 'icons/hicolor/scalable/apps')) + install_data('../data/poi.svg', install_dir: get_option('datadir') / 'icons/hicolor/scalable/apps') # firejail profile - install_data('../linux/firejail/poi.profile', install_dir: join_paths(get_option('libdir'), 'smolbote')) + install_data('../linux/firejail/poi.profile', install_dir: get_option('libdir') / 'smolbote') - # .desktop - configure_file(input: '../linux/poi.desktop.in', output: 'poi.desktop', configuration: conf, install_dir: join_paths(get_option('datadir'), 'applications')) - configure_file(input: '../linux/poi_firejail.desktop.in', output: 'poi_firejail.desktop', configuration: conf, install_dir: join_paths(get_option('datadir'), 'applications')) - configure_file(input: '../linux/poi_picksession.desktop.in', output: 'poi_picksession.desktop', configuration: conf, install_dir: join_paths(get_option('datadir'), 'applications')) + # Install .desktop to $prefix/share/applications + desktop_install_dir = get_option('datadir') / 'applications' + configure_file(input: '../linux/poi.desktop.in', output: 'poi.desktop', configuration: conf, install_dir: desktop_install_dir ) + configure_file(input: '../linux/poi_firejail.desktop.in', output: 'poi_firejail.desktop', configuration: conf, install_dir: desktop_install_dir ) + configure_file(input: '../linux/poi_picksession.desktop.in', output: 'poi_picksession.desktop', configuration: conf, install_dir: desktop_install_dir ) endif -- cgit v1.2.1