[file-roller] meson: Update to 0.59



commit cad8272b4034ad32f4a1cb28f2c06efdceee52f8
Author: Maximiliano Sandoval R <msandova gnome org>
Date:   Thu Mar 3 16:21:20 2022 +0100

    meson: Update to 0.59

 data/meson.build     |  2 +-
 meson.build          | 12 ++++++------
 nautilus/meson.build |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 7c1588e5..ebfeb290 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,4 +1,4 @@
-po_dir = join_paths(meson.source_root(), 'po')
+po_dir = join_paths(meson.project_source_root(), 'po')
 
 install_data('org.gnome.FileRoller.gschema.xml',
   install_dir : join_paths(datadir, 'glib-2.0', 'schemas')
diff --git a/meson.build b/meson.build
index 9abaef77..e632f38c 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project('file-roller', 'c',
   license : 'GPL2+',
   version : '3.42.0',
-  meson_version : '>=0.50'
+  meson_version : '>=0.59'
 )
 
 glib_version = '>=2.38'
@@ -51,7 +51,7 @@ cpio_path = 'cpio'
 if get_option('cpio') == 'auto'
   cpio = find_program('gcpio', 'cpio', required : false)
   if cpio.found()
-    cpio_path = cpio.path()
+    cpio_path = cpio.full_path()
   endif
 endif
 
@@ -63,10 +63,10 @@ config_data.set_quoted('LOCALEDIR', join_paths(prefix, get_option('localedir')))
 config_data.set_quoted('PACKAGE_NAME', meson.project_name())
 config_data.set_quoted('PACKAGE_VERSION', meson.project_version())
 if get_option('run-in-place')
-  config_data.set_quoted('PRIVDATADIR', join_paths(meson.source_root(), 'data'))
-  config_data.set_quoted('PRIVEXECDIR', join_paths(meson.source_root(), 'src', 'commands'))
-  config_data.set_quoted('UIDIR', join_paths(meson.source_root(), 'data', 'ui'))
-  config_data.set_quoted('SHDIR', join_paths(meson.source_root(), 'src', 'sh'))  
+  config_data.set_quoted('PRIVDATADIR', join_paths(meson.project_source_root(), 'data'))
+  config_data.set_quoted('PRIVEXECDIR', join_paths(meson.project_source_root(), 'src', 'commands'))
+  config_data.set_quoted('UIDIR', join_paths(meson.project_source_root(), 'data', 'ui'))
+  config_data.set_quoted('SHDIR', join_paths(meson.project_source_root(), 'src', 'sh'))
 else
   config_data.set_quoted('PRIVDATADIR', join_paths(datadir, meson.project_name()))
   config_data.set_quoted('PRIVEXECDIR', privexecdir)  
diff --git a/nautilus/meson.build b/nautilus/meson.build
index c371e586..bfcde2b2 100644
--- a/nautilus/meson.build
+++ b/nautilus/meson.build
@@ -16,5 +16,5 @@ shared_module('nautilus-fileroller',
   include_directories : config_inc,
   c_args : c_args,
   install : true,
-  install_dir : libnautilus_extension_dep.get_pkgconfig_variable('extensiondir')
+  install_dir : libnautilus_extension_dep.get_variable('extensiondir')
 )


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