[gnome-music/wip/mschraal/meson-0.59-updates: 140/140] meson: Fix deprecation




commit 380c11ec479cc41fb6e0dd773b3b4da1f589beda
Author: Marinus Schraal <mschraal gnome org>
Date:   Wed Aug 18 01:21:15 2021 +0200

    meson: Fix deprecation
    
    https://mesonbuild.com/Release-notes-for-0-56-0.html#mesonbuild_root-and-mesonsource_root-are-deprecated

 data/meson.build | 4 ++--
 meson.build      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index a42888cee..41b021ab2 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -29,7 +29,7 @@ i18n.merge_file(
     input: PROJECT_RDNN_NAME + '.desktop.in.in',
     configuration: desktop_conf),
   output: APPLICATION_ID + '.desktop',
-  po_dir: join_paths(meson.source_root(), 'po'),
+  po_dir: join_paths(meson.current_source_dir(), 'po'),
   install: true,
   install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'applications')
 )
@@ -56,7 +56,7 @@ i18n.merge_file(
     configuration: appdata_conf
   ),
   output: APPLICATION_ID + '.appdata.xml',
-  po_dir: join_paths(meson.source_root(), 'po'),
+  po_dir: join_paths(meson.current_source_dir(), 'po'),
   install: true,
   install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'metainfo')
 )
diff --git a/meson.build b/meson.build
index 488129219..9bcb6c1fb 100644
--- a/meson.build
+++ b/meson.build
@@ -96,12 +96,12 @@ configure_file(
 local_config = configuration_data()
 local_config.set('application_id', APPLICATION_ID)
 local_config.set('rdnn_name', PROJECT_RDNN_NAME)
-local_config.set('pkgdatadir', join_paths(meson.build_root(), 'data'))
+local_config.set('pkgdatadir', join_paths(meson.current_build_dir(), 'data'))
 local_config.set('localedir', join_paths(get_option('prefix'), get_option('datadir'), 'locale'))
-local_config.set('pythondir', meson.source_root())
-local_config.set('schemasdir', join_paths(meson.build_root(), 'data'))
+local_config.set('pythondir', meson.current_source_dir())
+local_config.set('schemasdir', join_paths(meson.current_build_dir(), 'data'))
 # Used for gfm
-local_config.set('gfmlibdir', join_paths(meson.build_root(), 'subprojects', 'gfm'))
+local_config.set('gfmlibdir', join_paths(meson.current_build_dir(), 'subprojects', 'gfm'))
 
 local_config.set('local_build', 'True')
 


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