[gedit] build: avoid the use of a global variable
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] build: avoid the use of a global variable
- Date: Fri, 6 Dec 2019 08:03:37 +0000 (UTC)
commit 18aacffa2ca67b25587d849952e6b5465e274c5e
Author: Sébastien Wilmet <swilmet gnome org>
Date: Fri Dec 6 08:57:38 2019 +0100
build: avoid the use of a global variable
gedit/meson.build | 6 ++++--
meson.build | 1 -
2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/gedit/meson.build b/gedit/meson.build
index 33690f0e6..075c001b2 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -171,8 +171,10 @@ libgedit_dep_sources = []
install_headers(
libgedit_public_h,
install_dir: join_paths(
- pkgincludedir,
- 'gedit',
+ get_option('prefix'),
+ get_option('includedir'),
+ package_string,
+ 'gedit'
)
)
diff --git a/meson.build b/meson.build
index 0040e5990..1cf07ca11 100644
--- a/meson.build
+++ b/meson.build
@@ -26,7 +26,6 @@ bindir = join_paths(get_option('prefix'), get_option('bindir'))
libdir = join_paths(get_option('prefix'), get_option('libdir'))
libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'))
datadir = join_paths(get_option('prefix'), get_option('datadir'))
-pkgincludedir = join_paths(get_option('prefix'), get_option('includedir'), package_string)
pkgconfigdir = join_paths(libdir, 'pkgconfig')
pkglibdir = join_paths(libdir, meson.project_name())
pkgdatadir = join_paths(datadir, meson.project_name())
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]