[gnome-characters] build: Change the install location of libgc



commit a0877645873d7c1020ef259483c6589adaa22210
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Wed Feb 7 18:13:37 2018 +0100

    build: Change the install location of libgc
    
    A garbage collector called Boehm GC also build a library called
    `libgc` and installs it in `libdir`.
    
    To avoid any issue with this library, the installation of our
    `libgc` library has been moved to `pkglibdir`.
    
    The GObject introspection files have also been moved to `pkglibdir`
    and `pkgdatadior`.

 lib/meson.build | 7 +++++--
 meson.build     | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/lib/meson.build b/lib/meson.build
index f0c1506..e6c06ac 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -26,7 +26,8 @@ libgc = shared_library(
   include_directories: top_inc,
   dependencies: libgc_deps,
   c_args: cflags,
-  install: true
+  install: true,
+  install_dir: characters_pkglibdir
 )
 
 gnome.generate_gir(
@@ -38,5 +39,7 @@ gnome.generate_gir(
   symbol_prefix: characters_ns.to_lower(),
   header: gc_h,
   includes: ['Gio-2.0', 'Gtk-3.0'],
-  install: true
+  install: true,
+  install_dir_gir: join_paths(characters_pkgdatadir, 'gir-' + characters_gir_version),
+  install_dir_typelib: join_paths(characters_pkglibdir, 'girepository-' + characters_gir_version)
 )
diff --git a/meson.build b/meson.build
index 3500bbc..ff45819 100644
--- a/meson.build
+++ b/meson.build
@@ -18,6 +18,7 @@ characters_libdir = join_paths(characters_prefix, get_option('libdir'))
 characters_libexecdir = join_paths(characters_prefix, get_option('libexecdir'))
 
 characters_pkgdatadir = join_paths(characters_datadir, characters_name)
+characters_pkglibdir = join_paths(characters_libdir, characters_name)
 
 characters_gir_version = '1.0'
 characters_ns = 'Gc'


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]