[gedit/zbrown/deteplification-src: 96/633] build: avoid the use of a global variable

[Zander Brown <zbrown src gnome org>]

commit eac674801df849af32dae21fc138ce7ec3297bb0
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 6f4614fc6..178b86e07 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -181,8 +181,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 923b44b12..883d85c24 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())