blob: f246254942ed3d8e4b468851ade2d1de7d904015 [file] [log] [blame]
Brad Bishop19323692019-04-05 15:28:33 -04001From 17fc9230fb932432d8faaaabf8c56fdc4845495e Mon Sep 17 00:00:00 2001
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05002From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 22 Mar 2016 15:14:58 +0200
4Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM
5
6We want to install this binary with the gio library, and debian
7renamer does not cope with library packages with files in ${bindir}
8
9Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
10Upstream-Status: Inappropriate [OE specific]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080011
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050012---
13 gio/Makefile.am | 3 ++-
Brad Bishop19323692019-04-05 15:28:33 -040014 gio/meson.build | 1 +
15 2 files changed, 3 insertions(+), 1 deletion(-)
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050016
17diff --git a/gio/Makefile.am b/gio/Makefile.am
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080018index e14cad2..bf2bcc7 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050019--- a/gio/Makefile.am
20+++ b/gio/Makefile.am
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080021@@ -835,7 +835,8 @@ gio.def: libgio-2.0.la
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050022 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 Bishop1a4b7ee2018-12-16 17:11:34 -080025-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 Williamsd8c66bc2016-06-20 12:57:21 -050027+libexec_PROGRAMS = gio-querymodules
28
29 glib_compile_resources_LDADD = libgio-2.0.la \
30 $(top_builddir)/gobject/libgobject-2.0.la \
Brad Bishop19323692019-04-05 15:28:33 -040031diff --git a/gio/meson.build b/gio/meson.build
32index 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',