[gtk-frdp] Set package_subdir to be a private location complying with FHS

[Felipe Borges <felipeborges src gnome org>]

commit cb96c2512888350b262a69e9f6bfe005e3830456
Author: Luciano Santos <luc14n0 linuxmail org>
Date:   Mon Sep 3 16:09:34 2018 +0000

    Set package_subdir to be a private location complying with FHS

 meson.build     | 9 ++++-----
 src/meson.build | 5 +++--
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/meson.build b/meson.build
index ad92815..3beda3f 100644
--- a/meson.build
+++ b/meson.build
@@ -16,14 +16,13 @@ add_project_arguments([
 ], language: 'c')
 
 package_subdir = get_option('package_subdir')
-datadir = join_paths (package_subdir, get_option('datadir'))
-libdir = join_paths(package_subdir, get_option('libdir'))
-girdir = join_paths(datadir, 'gir-1.0')
+libdir = join_paths(get_option('libdir'), package_subdir)
+girdir = join_paths(get_option('datadir'), package_subdir, 'gir-1.0')
 typelibdir = join_paths(libdir, 'girepository-1.0')
 if package_subdir != ''
-  vapidir = join_paths(datadir, 'vapi')
+  vapidir = join_paths(get_option('datadir'), package_subdir, 'vapi')
 else
-  vapidir = join_paths(datadir, 'vala', 'vapi')
+  vapidir = join_paths(get_option('datadir'), 'vala', 'vapi')
 endif
 
 gnome = import('gnome')
diff --git a/src/meson.build b/src/meson.build
index 3622faf..a7a68ef 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -23,7 +23,7 @@ version_conf.set('MINOR_VERSION', MINOR_VERSION)
 version_conf.set('MICRO_VERSION', MICRO_VERSION)
 
 gtk_frdp_header_subdir = join_paths(package_subdir, 'gtk-frdp')
-gtk_frdp_header_dir = join_paths(package_subdir, get_option('includedir'), gtk_frdp_header_subdir)
+gtk_frdp_header_dir = join_paths(get_option('includedir'), gtk_frdp_header_subdir)
 
 configure_file(
   input: 'gtk-frdp-version.h.in',
@@ -47,6 +47,7 @@ gtk_frdp_lib = shared_library('gtk-frdp-' + api_version,
   gtk_frdp_sources,
   dependencies: gtk_frdp_deps,
   install: true,
+  install_dir: libdir
 )
 
 gtk_frdp_dep = declare_dependency(
@@ -56,7 +57,7 @@ gtk_frdp_dep = declare_dependency(
   include_directories: include_directories('.'),
 )
 
-install_headers(gtk_frdp_headers, subdir: 'gtk-frdp')
+install_headers(gtk_frdp_headers, subdir: gtk_frdp_header_subdir)
 
 gtk_frdp_gir = gnome.generate_gir(gtk_frdp_lib,
   sources: gtk_frdp_sources + gtk_frdp_headers,