[gnome-font-viewer] build: move appdata snippet to data/
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-font-viewer] build: move appdata snippet to data/
- Date: Wed, 12 Sep 2018 11:54:56 +0000 (UTC)
commit b53706d96765e126f07b7d5a05d9bf6edb417c22
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Mon Sep 3 16:59:16 2018 -0700
build: move appdata snippet to data/
Now that we have a meson.build there.
data/meson.build | 12 ++++++++++++
meson.build | 11 -----------
2 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index feb1c1e..6ff3c1f 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1 +1,13 @@
+i18n = import('i18n')
+
+appdatadir = join_paths(datadir, 'metainfo')
+appdata_file = 'org.gnome.font-viewer.appdata.xml'
+i18n.merge_file(appdata_file,
+ input: appdata_file + '.in',
+ output: appdata_file,
+ po_dir: '../po',
+ install: true,
+ install_dir: appdatadir
+)
+
subdir('icons')
diff --git a/meson.build b/meson.build
index 3b72ccc..5d47590 100644
--- a/meson.build
+++ b/meson.build
@@ -7,7 +7,6 @@ project('gnome-font-viewer', 'c',
cc = meson.get_compiler('c')
gnome = import('gnome')
-i18n = import('i18n')
prefix = get_option('prefix')
@@ -18,7 +17,6 @@ localedir = join_paths(prefix, get_option('localedir'))
pkgdatadir = join_paths(datadir, meson.project_name())
-appdatadir = join_paths(datadir, 'metainfo')
desktopdir = join_paths(datadir, 'applications')
servicesdir = join_paths(datadir, 'dbus-1', 'services')
thumbnailerdir = join_paths(datadir, 'thumbnailers')
@@ -43,15 +41,6 @@ configure_file(output: 'config.h', configuration: config_h)
root_inc = include_directories('.')
-appdata_file = 'org.gnome.font-viewer.appdata.xml'
-i18n.merge_file(appdata_file,
- input: 'data/' + appdata_file + '.in',
- output: appdata_file,
- po_dir: 'po',
- install: true,
- install_dir: appdatadir
-)
-
subdir('src')
subdir('po')
subdir('data')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]