[jsonrpc-glib] build: Fix vapi subdir when bundled
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jsonrpc-glib] build: Fix vapi subdir when bundled
- Date: Fri, 9 Jun 2017 22:48:11 +0000 (UTC)
commit c1d404fa8addd2ae22bee30dcd541396d31d5b4e
Author: Patrick Griffis <tingping tingping se>
Date: Fri Jun 9 18:47:49 2017 -0400
build: Fix vapi subdir when bundled
meson.build | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/meson.build b/meson.build
index 7d0997f..f308c93 100644
--- a/meson.build
+++ b/meson.build
@@ -86,8 +86,12 @@ add_project_arguments(
package_subdir = get_option('package_subdir')
girdir = join_paths(get_option('datadir'), package_subdir, 'gir-1.0')
typelibdir = join_paths(get_option('libdir'), package_subdir, 'girepository-1.0')
-vapidir = join_paths(get_option('datadir'), package_subdir, 'vala', 'vapi')
libdir = join_paths(get_option('libdir'), package_subdir)
+if package_subdir != ''
+ vapidir = join_paths(get_option('datadir'), package_subdir, 'vapi')
+else
+ vapidir = join_paths(get_option('datadir'), 'vala', 'vapi')
+endif
gnome = import('gnome')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]