[dconf: 9/21] build: Remove unnecessary variables

[Philip Withnall <pwithnall src gnome org>]

commit 48b88c34d8917552f79e48c975b321d917fc0205
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Tue Apr 10 23:05:05 2018 +0200

    build: Remove unnecessary variables
    
    There are some defined variables that are not used. Some of these
    variables are also used as install directories, that are equal to
    default installation directories.
    
    These all unnecessary variables and default installation directories
    have been removed.

 bin/meson.build    | 3 +--
 client/meson.build | 8 +++-----
 meson.build        | 8 --------
 3 files changed, 4 insertions(+), 15 deletions(-)
---
diff --git a/bin/meson.build b/bin/meson.build
index d81cb29..0034798 100644
--- a/bin/meson.build
+++ b/bin/meson.build
@@ -17,8 +17,7 @@ executable(
   include_directories: top_inc,
   dependencies: deps,
   c_args: '-w',
-  install: true,
-  install_dir: dconf_bindir
+  install: true
 )
 
 install_data(
diff --git a/client/meson.build b/client/meson.build
index 579bce0..55f1ac0 100644
--- a/client/meson.build
+++ b/client/meson.build
@@ -36,8 +36,7 @@ libdconf = shared_library(
   include_directories: top_inc,
   dependencies: deps,
   c_args: cflags,
-  install: true,
-  install_dir: dconf_libdir
+  install: true
 )
 
 libdconf_dep = declare_dependency(
@@ -48,14 +47,13 @@ libdconf_dep = declare_dependency(
 
 pkg.generate(
   libraries: libdconf,
-  version: dconf_version,
+  version: meson.project_version(),
   name: meson.project_name(),
   description: meson.project_name() + ' client library',
   filebase: meson.project_name(),
   subdirs: meson.project_name(),
   requires: 'gio-2.0 ' + gio_req_version,
-  variables: 'exec_prefix=' + dconf_libexecdir,
-  install_dir: join_paths(dconf_libdir, 'pkgconfig')
+  variables: 'exec_prefix=' + dconf_libexecdir
 )
 
 libdconf_vapi = files(meson.project_name() + '.vapi')
diff --git a/meson.build b/meson.build
index c2532ad..334b32d 100644
--- a/meson.build
+++ b/meson.build
@@ -5,16 +5,8 @@ project(
   meson_version: '>= 0.43.0'
 )
 
-dconf_version = meson.project_version()
-version_array = dconf_version.split('.')
-dconf_major_version = version_array[0].to_int()
-dconf_minor_version = version_array[1].to_int()
-dconf_micro_version = version_array[2].to_int()
-
 dconf_prefix = get_option('prefix')
-dconf_bindir = join_paths(dconf_prefix, get_option('bindir'))
 dconf_datadir = join_paths(dconf_prefix, get_option('datadir'))
-dconf_includedir = join_paths(dconf_prefix, get_option('includedir'))
 dconf_libdir = join_paths(dconf_prefix, get_option('libdir'))
 dconf_libexecdir = join_paths(dconf_prefix, get_option('libexecdir'))
 dconf_mandir = join_paths(dconf_prefix, get_option('mandir'))