diff options
| author | Niels De Graef <nielsdegraef@gmail.com> | 2017-12-28 16:46:32 +0100 |
|---|---|---|
| committer | Niels De Graef <nielsdegraef@gmail.com> | 2017-12-28 16:46:32 +0100 |
| commit | 9286254274565bcc94a243c2d868fe0b7132a2fb (patch) | |
| tree | 3cf84c2dc946458b112a77e9a664cba76b91e747 /data | |
| parent | 10e6e8f6589728f2df9ff0418e4304b65040b781 (diff) | |
| download | gnome-contacts-9286254274565bcc94a243c2d868fe0b7132a2fb.tar.gz | |
Meson: install search provider to the correct dir.
Also: clean up the directory handling a bit.
Diffstat (limited to 'data')
| -rw-r--r-- | data/meson.build | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/meson.build b/data/meson.build index cef7a54..8f6defc 100644 --- a/data/meson.build +++ b/data/meson.build @@ -5,7 +5,7 @@ resources = gnome.compile_resources('org.gnome.Contacts', resource_files, ) # The icons -iconsdir = join_paths(get_option('datadir'), 'icons', 'hicolor') +iconsdir = join_paths(datadir, 'icons', 'hicolor') foreach size: ['16x16', '22x22', '32x32', '48x48', '512x512', 'symbolic'] install_subdir('icons/hicolor/' + size, install_dir: iconsdir) endforeach @@ -17,7 +17,7 @@ i18n.merge_file( type: 'desktop', po_dir: po_dir, install: true, - install_dir: join_paths(get_option('datadir'), 'applications') + install_dir: join_paths(datadir, 'applications') ) # The appdata file @@ -27,13 +27,13 @@ i18n.merge_file( type: 'xml', po_dir: po_dir, install: true, - install_dir: join_paths(get_option('datadir'), 'metainfo') + install_dir: join_paths(datadir, 'metainfo') ) # DBus service files service_config = configuration_data() -service_config.set('bindir', join_paths(get_option('prefix'), get_option('bindir'))) -service_config.set('libexecdir', join_paths(get_option('prefix'), get_option('libexecdir'))) +service_config.set('bindir', join_paths(bindir)) +service_config.set('libexecdir', join_paths(libexecdir)) # The DBUS service file of the app configure_file( @@ -41,7 +41,7 @@ configure_file( output: 'org.gnome.Contacts.service', configuration: service_config, install: true, - install_dir: join_paths(get_option('datadir'), 'dbus-1', 'services'), + install_dir: join_paths(datadir, 'dbus-1', 'services'), ) # The DBUS service file of the search provider @@ -50,10 +50,10 @@ configure_file( output: 'org.gnome.Contacts.SearchProvider.service', configuration: service_config, install: true, - install_dir: join_paths(get_option('datadir'), 'dbus-1', 'services'), + install_dir: join_paths(datadir, 'dbus-1', 'services'), ) # The search provider file install_data('org.gnome.Contacts.search-provider.ini', - install_dir: join_paths(get_option('datadir'), 'gnome-shell', 'search-providers'), + install_dir: join_paths(datadir, 'gnome-shell', 'search-providers'), ) |