diff --git a/SparkleShare/Linux/Images/icons/meson.build b/SparkleShare/Linux/Images/icons/meson.build index 5c50fa50..01c570bc 100644 --- a/SparkleShare/Linux/Images/icons/meson.build +++ b/SparkleShare/Linux/Images/icons/meson.build @@ -1,5 +1,5 @@ # Install app icons in system theme -theme_dir = join_paths('/usr', 'share', 'icons', 'hicolor') +theme_dir = join_paths(get_option('prefix'), 'share', 'icons', 'hicolor') icon_sizes = ['16', '22', '24', '32', '48', '256', '512'] app_icon_name = 'org.sparkleshare.SparkleShare' @@ -62,7 +62,7 @@ if get_option('ubuntu') size = '24' foreach theme : themes - theme_dir = join_paths('/usr', 'share', 'icons', theme) + theme_dir = join_paths(get_option('prefix'), 'share', 'icons', theme) install_data(sources: join_paths(theme, category, size, 'process-syncing.png'), install_dir: join_paths(theme_dir, category, size)) diff --git a/SparkleShare/Linux/meson.build b/SparkleShare/Linux/meson.build index b233d2cd..5da0b883 100644 --- a/SparkleShare/Linux/meson.build +++ b/SparkleShare/Linux/meson.build @@ -23,13 +23,14 @@ sparkleshare_src = ['../Common/SparkleShare.cs', configure_file( input: 'sparkleshare.in', output: 'sparkleshare', - configuration: configuration, install_dir: 'bin/') + configuration: configuration, install_dir: get_option('bindir')) # .desktop and .appdata files -install_data(sources: 'org.sparkleshare.SparkleShare.desktop', install_dir: join_paths('/usr', 'share', 'applications')) -install_data(sources: 'org.sparkleshare.SparkleShare.Invites.desktop', install_dir: join_paths('/usr', 'share', 'applications')) -install_data(sources: 'SparkleShare.Autostart.desktop', install_dir: join_paths('/usr', 'share', 'applications')) -install_data(sources: 'org.sparkleshare.SparkleShare.appdata.xml', install_dir: join_paths('/usr', 'share', 'appdata')) +apps_dir = join_paths(get_option('prefix'), 'share', 'applications') +install_data(sources: 'org.sparkleshare.SparkleShare.desktop', install_dir: apps_dir) +install_data(sources: 'org.sparkleshare.SparkleShare.Invites.desktop', install_dir: apps_dir) +install_data(sources: 'SparkleShare.Autostart.desktop', install_dir: apps_dir) +install_data(sources: 'org.sparkleshare.SparkleShare.appdata.xml', install_dir: join_paths(get_option('prefix'), 'share', 'appdata')) # Build SparkleShare