[gedit] build: avoid a variable for vapidir
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] build: avoid a variable for vapidir
- Date: Sat, 14 Mar 2020 14:25:10 +0000 (UTC)
commit 6da725d2b091b4599df7ac5d4e0dee434cb92812
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 0a7f2dccf..3044f17cf 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -237,7 +237,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 21e1173d1..1aad84f0c 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]