[gedit/zbrown/deteplification-src: 186/633] build: avoid a variable for vapidir




commit 8f6a252fcce7576b23ef6589b4dbf00c0fdc7f1c
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sat Mar 14 15:20:54 2020 +0100

    build: avoid a variable for vapidir

 gedit/meson.build | 2 +-
 meson.build       | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/gedit/meson.build b/gedit/meson.build
index 30b0414f4..197944f0a 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -247,7 +247,7 @@ libgedit_vapi = gnome.generate_vapi(
   sources: libgedit_gir.get(0),
   packages: libgedit_vapi_packages,
   install: true,
-  install_dir: vapidir,
+  install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'vala', 'vapi'),
 )
 
 libgedit_dep = declare_dependency(
diff --git a/meson.build b/meson.build
index 59f4b62e8..52213fbf0 100644
--- a/meson.build
+++ b/meson.build
@@ -29,9 +29,7 @@ datadir = join_paths(get_option('prefix'), get_option('datadir'))
 pkgconfigdir = join_paths(libdir, 'pkgconfig')
 pkglibdir = join_paths(libdir, meson.project_name())
 pkgdatadir = join_paths(datadir, meson.project_name())
-
 glibdir = join_paths(datadir, 'glib-2.0')
-vapidir = join_paths(datadir, 'vala', 'vapi')
 
 # Subprojects
 if not get_option('buildtype').contains('plain')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]