[gnome-builder] build: fix generated header installation directory
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] build: fix generated header installation directory
- Date: Tue, 24 Oct 2017 20:47:12 +0000 (UTC)
commit dfd454d21134e3a657893bef5e3d4d5a1aeec620
Author: Christian Hergert <chergert redhat com>
Date: Tue Oct 24 13:46:45 2017 -0700
build: fix generated header installation directory
This accidentally got switched during our massive build system cleanup
and ended up in $prefix/gnome-builder/libide rather than
$prefix/include/gnome-builder/libide.
https://bugzilla.gnome.org/show_bug.cgi?id=789426
src/libide/meson.build | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/libide/meson.build b/src/libide/meson.build
index 67fc7af..33bd41c 100644
--- a/src/libide/meson.build
+++ b/src/libide/meson.build
@@ -1,3 +1,4 @@
+libide_header_dir = join_paths(get_option('includedir'), 'gnome-builder', 'libide')
libide_header_subdir = join_paths('gnome-builder', 'libide')
libide_api_version = '1.0'
@@ -20,7 +21,7 @@ version_data.set_quoted('BUILD_TYPE', get_option('buildtype'))
libide_version_h = configure_file(
input: 'ide-version.h.in',
output: 'ide-version.h',
- install_dir: libide_header_subdir,
+ install_dir: libide_header_dir,
install: true,
configuration: version_data)
libide_generated_headers += [libide_version_h]
@@ -100,7 +101,7 @@ libide_enums = gnome.mkenums('ide-enums',
c_template: 'ide-enums.c.in',
sources: libide_enum_headers,
install_header: true,
- install_dir: libide_header_subdir,
+ install_dir: libide_header_dir,
)
libide_public_sources += [libide_enums[0]]
libide_generated_headers += [libide_enums[1]]
@@ -113,7 +114,7 @@ libide_debug_h = configure_file(
output: 'ide-debug.h',
configuration: libide_conf,
install: true,
- install_dir: libide_header_subdir,
+ install_dir: libide_header_dir,
)
libide_generated_headers += [libide_debug_h]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]