[gxml] Fixed documentation, header and pc file installations

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit c04ff485fc0b97870385f9572413a3604823a161
Author: Daniel Espinosa <esodan gmail com>
Date:   Thu May 11 08:58:31 2017 -0500

    Fixed documentation, header and pc file installations

 docs/meson.build |    4 ++--
 gxml/gxml.pc.in  |    2 +-
 gxml/meson.build |   11 +++++------
 po/meson.build   |    2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/docs/meson.build b/docs/meson.build
index ad3f8f8..0576626 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -6,6 +6,7 @@ pkgname = '--package-name='+'GXml-'+API_VERSION
 pkgversion = '--package-version='+GXML_VERSION
 vapidirgxml = '--vapidir='+join_paths (meson.current_source_dir (),'gxml')
 vapidirvapi = '--vapidir='+join_paths (meson.current_source_dir (),'vapi')
+docsdir = join_paths (get_option ('datadir'), 'devhelp','books')
 
 custom_target ('valadocs',
                input : sources,
@@ -27,5 +28,4 @@ custom_target ('valadocs',
                        '--directory=@OUTDIR@',
                        valasources],
                install : true,
-               install_dir : join_paths (meson.current_source_dir (), 'devhelp','books'))
-
+               install_dir : docsdir)
diff --git a/gxml/gxml.pc.in b/gxml/gxml.pc.in
index 761f885..d1aa503 100644
--- a/gxml/gxml.pc.in
+++ b/gxml/gxml.pc.in
@@ -10,4 +10,4 @@ URL: http://live.gnome.org/GXml
 Version: @GXML_VERSION@
 Requires: @PCDEPS@
 Libs: -L${libdir} -lgxml-@API_VERSION@
-Cflags: -I${includedir}/gxml-@API_VERSION@/gxml
+Cflags: -I${includedir}/gxml-@API_VERSION@
diff --git a/gxml/meson.build b/gxml/meson.build
index 3f1618e..db6dc15 100644
--- a/gxml/meson.build
+++ b/gxml/meson.build
@@ -1,9 +1,10 @@
-vapidir = get_option('datadir') + '/vala/vapi'
-includedir = get_option('includedir') + '/gxml-@0@/gxml'.format(API_VERSION)
+vapidir = join_paths (get_option('datadir'),'vala','vapi')
 
 conf = configuration_data()
 conf.set('prefix', get_option('prefix'))
-conf.set('libdir', get_option('prefix') + '/' + get_option('libdir'))
+conf.set('exec_prefix', get_option('prefix'))
+conf.set('libdir', join_paths (get_option ('prefix'),get_option ('libdir')))
+conf.set('includedir', get_option ('includedir'))
 conf.set('VALADEPS', VALADEPS)
 conf.set('PCDEPS', PCDEPS)
 conf.set('GXML_VERSION', GXML_VERSION)
@@ -138,13 +139,11 @@ gxml = library('gxml-@0@'.format(API_VERSION),
        install : true,
        install_dir : [
                get_option('libdir'),
-               includedir,
+               join_paths (get_option('includedir'),'gxml-@0@'.format (API_VERSION)),
                vapidir,
                true
        ])
 
-install_headers('xlibxml.h', subdir : includedir)
-
 g_ir_compiler = find_program('g-ir-compiler')
 custom_target('gxml-typelib',
        command: [
diff --git a/po/meson.build b/po/meson.build
index 28288c6..ff9525c 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,2 +1,2 @@
 i18n = import('i18n')
-i18n.gettext('gxml', preset : 'glib')
+i18n.gettext('gxml-@0@'.format (API_VERSION), preset : 'glib')