[rygel/wip/meson: 64/85] meson: Fix header install path

[Jens Georg <jensgeorg src gnome org>]

commit cc5dcef327c1b63724465bd4d9fdcdaf974e9ebc
Author: Jens Georg <mail jensge org>
Date:   Sun May 21 19:38:17 2017 +0200

    meson: Fix header install path

 meson.build                           | 1 +
 src/librygel-core/meson.build         | 2 +-
 src/librygel-db/meson.build           | 2 +-
 src/librygel-renderer-gst/meson.build | 2 +-
 src/librygel-renderer/meson.build     | 2 +-
 src/librygel-ruih/meson.build         | 2 +-
 src/librygel-server/meson.build       | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/meson.build b/meson.build
index bcd74089..8951f98a 100644
--- a/meson.build
+++ b/meson.build
@@ -11,6 +11,7 @@ rygel_libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'),
 rygel_presetdir = join_paths(rygel_datadir, 'rygel', 'presets')
 rygel_bigicondir = join_paths(rygel_datadir, 'rygel', 'icons', '120x120')
 rygel_smallicondir = join_paths(rygel_datadir, 'rygel', 'icons', '48x48')
+rygel_includedir = join_paths(get_option('includedir'), 'rygel-2.6')
 
 conf = configuration_data()
 conf.set('GETTEXT_PACKAGE', '"rygel"')
diff --git a/src/librygel-core/meson.build b/src/librygel-core/meson.build
index 90c8a6b4..965d7346 100644
--- a/src/librygel-core/meson.build
+++ b/src/librygel-core/meson.build
@@ -42,7 +42,7 @@ core_lib = library('rygel-core-2.6', core_sources,
         vala_gir : 'Rygel-2.6.gir',
         vala_header : 'rygel-core.h',
         install: true,
-        install_dir : [true, true, true, false])
+        install_dir : [true, rygel_includedir, true, false])
 
 custom_target('RygelCore-2.6.typelib',
                command: [g_ir_compiler, '--output', '@OUTPUT@', '@INPUT@'],
diff --git a/src/librygel-db/meson.build b/src/librygel-db/meson.build
index 3e576298..435ad17c 100644
--- a/src/librygel-db/meson.build
+++ b/src/librygel-db/meson.build
@@ -12,7 +12,7 @@ db_lib = library('rygel-db-2.6', db_sources,
         version: '2.0.4',
         vala_header : 'rygel-db.h',
         install: true,
-        install_dir : [true, true, true])
+        install_dir : [true, rygel_includedir, true])
 
 # need to add to get the current build dir as include dir
 rygel_db = declare_dependency(include_directories: include_directories('.'),
diff --git a/src/librygel-renderer-gst/meson.build b/src/librygel-renderer-gst/meson.build
index 4fb9be2c..02e56df4 100644
--- a/src/librygel-renderer-gst/meson.build
+++ b/src/librygel-renderer-gst/meson.build
@@ -9,7 +9,7 @@ renderer_gst_lib = library('rygel-renderer-gst-2.6', renderer_gst_sources,
         vala_gir : 'Rygel-2.6.gir',
         vala_header : 'rygel-renderer-gst.h',
         install: true,
-        install_dir : [true, true, true, false])
+        install_dir : [true, rygel_includedir, true, false])
 
 custom_target('RygelRendererGst-2.6.typelib',
                command: [g_ir_compiler,
diff --git a/src/librygel-renderer/meson.build b/src/librygel-renderer/meson.build
index 656e20e8..ab15147b 100644
--- a/src/librygel-renderer/meson.build
+++ b/src/librygel-renderer/meson.build
@@ -17,7 +17,7 @@ renderer_lib = library('rygel-renderer-2.6', renderer_sources,
         vala_gir : 'Rygel-2.6.gir',
         vala_header : 'rygel-renderer.h',
         install: true,
-        install_dir : [true, true, true, false])
+        install_dir : [true, rygel_includedir, true, false])
 
 custom_target('RygelRenderer-2.6.typelib',
                command: [g_ir_compiler,
diff --git a/src/librygel-ruih/meson.build b/src/librygel-ruih/meson.build
index a2372f13..d407ddfa 100644
--- a/src/librygel-ruih/meson.build
+++ b/src/librygel-ruih/meson.build
@@ -17,7 +17,7 @@ ruih_lib = library('rygel-ruih-2.6', ruih_sources,
         version: '1.0.0',
         vala_header : 'rygel-ruih.h',
         install: true,
-        install_dir : [true, true, true])
+        install_dir : [true, rygel_includedir, true])
 
 # need to add to get the current build dir as include dir
 rygel_ruih = declare_dependency(include_directories: include_directories('.'),
diff --git a/src/librygel-server/meson.build b/src/librygel-server/meson.build
index 579be060..15003a2e 100644
--- a/src/librygel-server/meson.build
+++ b/src/librygel-server/meson.build
@@ -95,7 +95,7 @@ server_lib = library('rygel-server-2.6', server_sources,
         vala_gir : 'Rygel-2.6.gir',
         vala_header : 'rygel-server.h',
         install: true,
-        install_dir : [true, true, true, false])
+        install_dir : [true, rygel_includedir, true, false])
 
 custom_target('RygelServer-2.6.typelib',
                command: [g_ir_compiler,