[recipes] Use pkgdatadir and datadir consistently
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [recipes] Use pkgdatadir and datadir consistently
- Date: Tue, 28 Feb 2017 20:59:50 +0000 (UTC)
commit 6ec0f131e0a356f7a131e9174a49786f744d5a8e
Author: Matthias Clasen <mclasen matthiass-mbp home>
Date: Mon Feb 27 21:36:40 2017 -0500
Use pkgdatadir and datadir consistently
Instead of hardcoding share/ all over the place, use the
variables we have.
data/meson.build | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 0c7aa4e..6defc69 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -151,18 +151,18 @@ install_data( 'images/adelia.jpg',
'images/whitefish3.jpg',
'images/whitefish4.jpg',
'images/wholesale-crackers.jpg',
- install_dir: 'share/gnome-recipes/images')
+ install_dir: join_paths([pkgdatadir,'images']))
install_data('sounds/complete.oga',
- install_dir: 'share/gnome-recipes/sounds')
+ install_dir: join_paths([pkgdatadir,'sounds']))
install_data('chefs.db',
'picks.db',
'recipes.db',
- install_dir: 'share/gnome-recipes')
+ install_dir: pkgdatadir)
install_data('org.gnome.Recipes-mime.xml',
- install_dir: 'share/mime/packages')
+ install_dir: join_paths([datadir, 'mime/packages']))
msgfmt = find_program('msgfmt')
@@ -170,35 +170,35 @@ custom_target('desktop-file',
output: 'org.gnome.Recipes.desktop',
input: files('org.gnome.Recipes.desktop.in'),
install: true,
- install_dir: 'share/applications',
+ install_dir: join_paths([datadir,'applications']),
command: [msgfmt, '--desktop', '-d', '../po', '--template', '@INPUT@', '-o', '@OUTPUT@'])
custom_target('appdata',
output: 'org.gnome.Recipes.appdata.xml',
input: files('appdata/org.gnome.Recipes.appdata.xml.in'),
install: true,
- install_dir: 'share/appdata',
+ install_dir: join_paths([datadir,'appdata']),
command: [msgfmt, '--xml', '-d', '../po', '--template', '@INPUT@', '-o', '@OUTPUT@'])
configure_file(input: 'org.gnome.Recipes.service.in',
output: 'org.gnome.Recipes.service',
configuration: conf,
- install_dir: 'share/dbus-1/services')
+ install_dir: join_paths([datadir,'dbus-1/services']))
install_data( 'icons/16x16/org.gnome.Recipes.png',
'icons/16x16/org.gnome.Recipes-symbolic.symbolic.png',
- install_dir: 'share/icons/hicolor/16x16/apps')
+ install_dir: join_paths([datadir,'icons/hicolor/16x16/apps']))
install_data( 'icons/24x24/org.gnome.Recipes.png',
'icons/24x24/org.gnome.Recipes-symbolic.symbolic.png',
- install_dir: 'share/icons/hicolor/24x24/apps')
+ install_dir: join_paths([datadir,'icons/hicolor/24x24/apps']))
install_data( 'icons/32x32/org.gnome.Recipes.png',
'icons/32x32/org.gnome.Recipes-symbolic.symbolic.png',
- install_dir: 'share/icons/hicolor/32x32/apps')
+ install_dir: join_paths([datadir,'icons/hicolor/32x32/apps']))
install_data( 'icons/48x48/org.gnome.Recipes.png',
'icons/48x48/org.gnome.Recipes-symbolic.symbolic.png',
- install_dir: 'share/icons/hicolor/48x48/apps')
+ install_dir: join_paths([datadir,'icons/hicolor/48x48/apps']))
install_data( 'icons/512x512/org.gnome.Recipes.png',
'icons/512x512/org.gnome.Recipes-symbolic.symbolic.png',
- install_dir: 'share/icons/hicolor/512x512/apps')
+ install_dir: join_paths([datadir,'icons/hicolor/512x512/apps']))
install_data( 'icons/symbolic/org.gnome.Recipes-symbolic.svg',
- install_dir: 'share/icons/hicolor/symbolic/apps')
+ install_dir: join_paths([datadir,'icons/hicolor/symbolic/apps']))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]