beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

build: Fix some hardcoded paths

Browse source
This commit is contained in:
Hylke Bons 2018-02-19 23:44:34 +00:00
parent 1852c6207c
commit 285de02411
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SparkleShare/Linux/Images/icons/meson.build
View file

@ -1,5 +1,5 @@
# Install app icons in system theme # 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'] icon_sizes = ['16', '22', '24', '32', '48', '256', '512']
app_icon_name = 'org.sparkleshare.SparkleShare' app_icon_name = 'org.sparkleshare.SparkleShare'
@ -62,7 +62,7 @@ if get_option('ubuntu')
size = '24' size = '24'
foreach theme : themes 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_data(sources: join_paths(theme, category, size, 'process-syncing.png'),
install_dir: join_paths(theme_dir, category, size)) install_dir: join_paths(theme_dir, category, size))

11
SparkleShare/Linux/meson.build
View file

@ -23,13 +23,14 @@ sparkleshare_src = ['../Common/SparkleShare.cs',
configure_file( configure_file(
input: 'sparkleshare.in', input: 'sparkleshare.in',
output: 'sparkleshare', output: 'sparkleshare',
configuration: configuration, install_dir: 'bin/') configuration: configuration, install_dir: get_option('bindir'))
# .desktop and .appdata files # .desktop and .appdata files
install_data(sources: 'org.sparkleshare.SparkleShare.desktop', install_dir: join_paths('/usr', 'share', 'applications')) apps_dir = join_paths(get_option('prefix'), 'share', 'applications')
install_data(sources: 'org.sparkleshare.SparkleShare.Invites.desktop', install_dir: join_paths('/usr', 'share', 'applications')) install_data(sources: 'org.sparkleshare.SparkleShare.desktop', install_dir: apps_dir)
install_data(sources: 'SparkleShare.Autostart.desktop', install_dir: join_paths('/usr', 'share', 'applications')) install_data(sources: 'org.sparkleshare.SparkleShare.Invites.desktop', install_dir: apps_dir)
install_data(sources: 'org.sparkleshare.SparkleShare.appdata.xml', install_dir: join_paths('/usr', 'share', 'appdata')) 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 # Build SparkleShare