[at-spi2-core] More meson fixes

[Mike Gorse <mgorse src gnome org>]

commit 5c28111899c499306ad1d63b1910f40690b02082
Author: Mike Gorse <mgorse suse com>
Date:   Mon Aug 7 21:25:13 2017 -0500

    More meson fixes

 atspi/meson.build |    6 +++---
 meson.build       |   13 ++++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/atspi/meson.build b/atspi/meson.build
index aa1a0a9..1ec3ecd 100644
--- a/atspi/meson.build
+++ b/atspi/meson.build
@@ -36,7 +36,6 @@ atspi_headers = [
   'atspi-device-listener.h',
   'atspi-document.h',
   'atspi-editabletext.h',
-  'atspi-enum-types.h',
   'atspi-event-listener.h',
   'atspi-gmain.h',
   'atspi-hyperlink.h',
@@ -45,7 +44,6 @@ atspi_headers = [
   'atspi-matchrule.h',
   'atspi-misc.h',
   'atspi-object.h',
-  'atspi-private.h',
   'atspi-registry.h',
   'atspi-relation.h',
   'atspi-selection.h',
@@ -57,7 +55,9 @@ atspi_headers = [
   'atspi-value.h',
 ]
 
-atspi_includedir = join_paths(get_option('includedir'), 'at-spi-2.0', 'atspi')
+atspi_includedir = join_paths(get_option('prefix'), get_option('includedir'), 'at-spi-2.0', 'atspi')
+
+install_headers(atspi_headers, subdir: atspi_includedir)
 
 atspi_enums = gnome.mkenums('atspi-enum-types',
                             sources: [ 'atspi-constants.h', 'atspi-types.h' ],
diff --git a/meson.build b/meson.build
index caac91b..fab3d35 100644
--- a/meson.build
+++ b/meson.build
@@ -23,9 +23,12 @@ at_spi_conf.set('GETTEXT_PACKAGE', meson.project_name())
 root_inc = include_directories('.')
 registryd_inc = include_directories('registryd')
 
-atspi_datadir = join_paths(get_option('prefix'), get_option('datadir'))
-atspi_libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'))
-atspi_sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir'))
+atspi_prefix = get_option('prefix')
+atspi_datadir = join_paths(atspi_prefix, get_option('datadir'))
+atspi_libexecdir = join_paths(atspi_prefix, get_option('libexecdir'))
+atspi_sysconfdir = join_paths(atspi_prefix, get_option('sysconfdir'))
+atspi_libdir = join_paths(atspi_prefix, get_option('libdir'))
+atspi_includedir = join_paths(atspi_prefix, get_option('includedir'))
 
 if get_option('dbus_services_dir') != 'default'
   dbus_services_dir = get_option('dbus_services_dir')
@@ -106,8 +109,8 @@ configure_file(output: 'config.h', configuration: at_spi_conf)
 pkgconf = configuration_data()
 pkgconf.set('prefix', get_option('prefix'))
 pkgconf.set('exec_prefix', get_option('prefix'))
-pkgconf.set('libdir', get_option('libdir'))
-pkgconf.set('includedir', get_option('includedir'))
+pkgconf.set('libdir', atspi_libdir)
+pkgconf.set('includedir', atspi_includedir)
 pkgconf.set('VERSION', meson.project_version())
 
 configure_file(input: 'atspi-2.pc.in',