[gnome-maps/wip/mlundblad/es6-modules: 5/29] meson: Pass suffix variable to script config




commit 468ad189207729cadcb00808fc387cabb561e196
Author: Marcus Lundblad <ml dfupdate se>
Date:   Mon May 2 23:05:34 2022 +0200

    meson: Pass suffix variable to script config

 src/meson.build | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index be7e6636..feaaad25 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,8 +1,17 @@
+# suffix for source resources (so we get /org/gnome/Maps or
+# /org/gnome/Maps/Devel, depending on the profile)
+if (get_option('profile') == 'development')
+       suffix = '/Devel'
+else
+       suffix = ''
+endif
+
 script_conf = configuration_data()
 script_conf.set('GJS', gjs.path())
 script_conf.set('PACKAGE_VERSION', version)
 script_conf.set('libdir', libdir)
 script_conf.set('prefix', prefix)
+script_conf.set('suffix', suffix)
 
 configure_file(
        input: 'org.gnome.Maps.in',
@@ -13,11 +22,8 @@ configure_file(
 )
 
 sources_conf = configuration_data()
-if (get_option('profile') == 'development')
-       sources_conf.set('suffix', '/Devel')
-else
-       sources_conf.set('suffix', '')
-endif
+sources_conf.set('suffix', suffix)
+
 gnome.compile_resources(
        app_id + '.src',
        configure_file(


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