[geary: 3/4] Fix meson targets for contractor contract
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary: 3/4] Fix meson targets for contractor contract
- Date: Thu, 10 Jan 2019 12:21:25 +0000 (UTC)
commit b8ae8865ea1599600d4573fa7d020ef8178fe8eb
Author: Greg V <greg@unrelenting.technology>
Date: Wed Jan 9 12:50:13 2019 +0300
Fix meson targets for contractor contract
desktop/meson.build | 2 +-
meson.build | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/desktop/meson.build b/desktop/meson.build
index e051cdc9..29f9ce74 100644
--- a/desktop/meson.build
+++ b/desktop/meson.build
@@ -25,7 +25,7 @@ if install_contractor_file
# Description field. See merge req !50.
msgfmt = find_program('msgfmt')
- custom_target(
+ custom_target('geary-attach-contract',
input: 'geary-attach.contract.desktop.in',
output: 'geary-attach.contract',
command: [msgfmt, '--desktop', '--keyword=Description', '--template', '@INPUT@', '-d', po_dir, '-o',
'@OUTPUT@'],
diff --git a/meson.build b/meson.build
index 95bf584b..85e50c5b 100644
--- a/meson.build
+++ b/meson.build
@@ -20,6 +20,7 @@ cc = meson.get_compiler('c')
valac = meson.get_compiler('vala')
config_h_dir = include_directories('.')
geary_prefix = get_option('prefix')
+bindir = join_paths(geary_prefix, get_option('bindir'))
datadir = join_paths(geary_prefix, get_option('datadir'))
libdir = join_paths(geary_prefix, get_option('libdir'))
locale_dir = join_paths(geary_prefix, get_option('localedir'))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]