Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From 17fc9230fb932432d8faaaabf8c56fdc4845495e Mon Sep 17 00:00:00 2001 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 3 | Date: Tue, 22 Mar 2016 15:14:58 +0200 |
| 4 | Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM |
| 5 | |
| 6 | We want to install this binary with the gio library, and debian |
| 7 | renamer does not cope with library packages with files in ${bindir} |
| 8 | |
| 9 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 10 | Upstream-Status: Inappropriate [OE specific] |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 11 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 12 | --- |
| 13 | gio/Makefile.am | 3 ++- |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 14 | gio/meson.build | 1 + |
| 15 | 2 files changed, 3 insertions(+), 1 deletion(-) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 16 | |
| 17 | diff --git a/gio/Makefile.am b/gio/Makefile.am |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 18 | index e14cad2..bf2bcc7 100644 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 19 | --- a/gio/Makefile.am |
| 20 | +++ b/gio/Makefile.am |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 21 | @@ -835,7 +835,8 @@ gio.def: libgio-2.0.la |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 22 | gio-2.0.lib: libgio-2.0.la gio.def |
| 23 | $(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gio.def -out:$@ |
| 24 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 25 | -bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings gio-launch-desktop |
| 26 | +bin_PROGRAMS = glib-compile-schemas glib-compile-resources gsettings gio-launch-desktop |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 27 | +libexec_PROGRAMS = gio-querymodules |
| 28 | |
| 29 | glib_compile_resources_LDADD = libgio-2.0.la \ |
| 30 | $(top_builddir)/gobject/libgobject-2.0.la \ |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 31 | diff --git a/gio/meson.build b/gio/meson.build |
| 32 | index b83d8f5..85d8b14 100644 |
| 33 | --- a/gio/meson.build |
| 34 | +++ b/gio/meson.build |
| 35 | @@ -925,6 +925,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu |
| 36 | c_args : gio_c_args, |
| 37 | # intl.lib is not compatible with SAFESEH |
| 38 | link_args : noseh_link_args, |
| 39 | + install_dir: glib_libexecdir, |
| 40 | dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) |
| 41 | |
| 42 | glib_compile_schemas = executable('glib-compile-schemas', |