[gedit/zbrown/deteplification-src: 68/633] build: have less variables for all the dirs




commit 035f6ea8a7d5a934c6d5ff6112d1d06595280e58
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Wed Dec 4 14:32:42 2019 +0100

    build: have less variables for all the dirs
    
    builddir was dead code.

 meson.build | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/meson.build b/meson.build
index e84865b69..c41e537eb 100644
--- a/meson.build
+++ b/meson.build
@@ -17,14 +17,12 @@ package_string = '@0@-@1@'.format(meson.project_name(), api_version)
 root_include_dir = include_directories('.')
 
 srcdir = meson.current_source_dir()
-builddir = meson.current_build_dir()
 
 bindir = join_paths(get_option('prefix'), get_option('bindir'))
-includedir = join_paths(get_option('prefix'), get_option('includedir'))
 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(includedir, package_string)
+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]