[gnome-builder] build: Install headers into unversioned include dir

[Patrick Griffis <pgriffis src gnome org>]

commit d8d092a604cbf089b51a7eeb6b24f26a85c99192
Author: Patrick Griffis <tingping tingping se>
Date:   Fri Jun 9 17:39:18 2017 -0400

    build: Install headers into unversioned include dir
    
    This potentially makes it more simple for subprojects and nothing
    else was versioned anyway.

 contrib/gstyle/meson.build |    3 +--
 meson.build                |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/contrib/gstyle/meson.build b/contrib/gstyle/meson.build
index 9638d95..bcdf546 100644
--- a/contrib/gstyle/meson.build
+++ b/contrib/gstyle/meson.build
@@ -29,8 +29,7 @@ libgstyle_headers = [
   'gstyle-xyz.h',
 ]
 
-libgstyle_header_dir = join_paths(get_option('includedir'),
-  'gnome-builder-' + meson.project_version(), 'gstyle')
+libgstyle_header_dir = join_paths(pkgincludedir, 'gstyle')
 
 install_headers(libgstyle_headers,
   install_dir: libgstyle_header_dir,
diff --git a/meson.build b/meson.build
index 701a60e..11da5dc 100644
--- a/meson.build
+++ b/meson.build
@@ -16,7 +16,7 @@ MICRO_VERSION = version_split[2]
 
 pkglibdir_abs = join_paths(get_option('prefix'), get_option('libdir'), 'gnome-builder')
 pkglibdir = join_paths(get_option('libdir'), 'gnome-builder')
-pkgincludedir = join_paths(get_option('includedir'), 'gnome-builder-' + meson.project_version())
+pkgincludedir = join_paths(get_option('includedir'), 'gnome-builder')
 pkggirdir = join_paths(get_option('datadir'),'gnome-builder', 'gir-1.0')
 pkgtypelibdir = join_paths(get_option('libdir'), 'gnome-builder', 'girepository-1.0')
 pkgvapidir = join_paths(get_option('datadir'), 'gnome-builder/vapi')