[gobject-introspection/ebassi/glib-update] build: Gate directory variables on older Meson



commit cb70b46f7fa6648df77afd58c8b2c3bfb8103360
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Wed Jul 13 14:53:30 2022 +0100

    build: Gate directory variables on older Meson
    
    Meson 0.62 automatically adds variables for standard directories to the
    pkg-config files it generates.

 meson.build | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index c30261e9..d97116a0 100644
--- a/meson.build
+++ b/meson.build
@@ -249,8 +249,6 @@ if host_system == 'windows' or host_system == 'cygwin'
 endif
 
 pkgconfig_variables = [
-  'datadir=' + '${prefix}' / get_option('datadir'),
-  'bindir=' + '${prefix}' / get_option('bindir'),
   'g_ir_scanner=${bindir}/g-ir-scanner',
   'g_ir_compiler=${bindir}/g-ir-compiler@0@'.format(exe_ext),
   'g_ir_generate=${bindir}/g-ir-generate@0@'.format(exe_ext),
@@ -259,6 +257,13 @@ pkgconfig_variables = [
   'typelibdir=${libdir}/girepository-1.0',
 ]
 
+if meson.version().version_compare('<0.62.0')
+  pkgconfig_variables += [
+    'datadir=' + '${prefix}' / get_option('datadir'),
+    'bindir=' + '${prefix}' / get_option('bindir'),
+  ]
+endif
+
 pkg.generate(girepo_lib,
   name : 'gobject-introspection',
   filebase : 'gobject-introspection-1.0',


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