| From 17fc9230fb932432d8faaaabf8c56fdc4845495e Mon Sep 17 00:00:00 2001 |
| From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| Date: Tue, 22 Mar 2016 15:14:58 +0200 |
| Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM |
| |
| We want to install this binary with the gio library, and debian |
| renamer does not cope with library packages with files in ${bindir} |
| |
| Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| Upstream-Status: Inappropriate [OE specific] |
| |
| --- |
| gio/Makefile.am | 3 ++- |
| gio/meson.build | 1 + |
| 2 files changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/gio/Makefile.am b/gio/Makefile.am |
| index e14cad2..bf2bcc7 100644 |
| --- a/gio/Makefile.am |
| +++ b/gio/Makefile.am |
| @@ -835,7 +835,8 @@ gio.def: libgio-2.0.la |
| gio-2.0.lib: libgio-2.0.la gio.def |
| $(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gio.def -out:$@ |
| |
| -bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings gio-launch-desktop |
| +bin_PROGRAMS = glib-compile-schemas glib-compile-resources gsettings gio-launch-desktop |
| +libexec_PROGRAMS = gio-querymodules |
| |
| glib_compile_resources_LDADD = libgio-2.0.la \ |
| $(top_builddir)/gobject/libgobject-2.0.la \ |
| diff --git a/gio/meson.build b/gio/meson.build |
| index b83d8f5..85d8b14 100644 |
| --- a/gio/meson.build |
| +++ b/gio/meson.build |
| @@ -925,6 +925,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu |
| c_args : gio_c_args, |
| # intl.lib is not compatible with SAFESEH |
| link_args : noseh_link_args, |
| + install_dir: glib_libexecdir, |
| dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) |
| |
| glib_compile_schemas = executable('glib-compile-schemas', |