From 3301c7e11e79235a38edddc87c849d60416e7579 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Fri, 14 Sep 2018 01:26:17 -0700 Subject: configure.ac: make GIR_DIR configurable Some .gir files such as GLib-2.0.gir are arch related which contain such as lengths of pointers that they are different for 64 and 32 bit target. It causes install file conflicts for multilib when intall gobject-introspection and lib32-gobject-introspection both. Add configure option 'with-gir-dir-prefix' for autotools to make .gir could be installed to a configured path such as ${libdir}. And update girdir in .pc files as well. Signed-off-by: Kai Kang --- gobject-introspection-1.0.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gobject-introspection-1.0.pc.in') diff --git a/gobject-introspection-1.0.pc.in b/gobject-introspection-1.0.pc.in index a08b5d27..3409856c 100644 --- a/gobject-introspection-1.0.pc.in +++ b/gobject-introspection-1.0.pc.in @@ -10,7 +10,7 @@ g_ir_scanner=${bindir}/g-ir-scanner g_ir_compiler=${bindir}/g-ir-compiler@EXEEXT@ g_ir_generate=${bindir}/g-ir-generate@EXEEXT@ gidatadir=${datadir}/gobject-introspection-1.0 -girdir=${datadir}/gir-1.0 +girdir=@GIR_DIR@ typelibdir=${libdir}/girepository-1.0 Cflags: -I${includedir}/gobject-introspection-1.0 @FFI_PC_CFLAGS@ -- cgit v1.2.1