diff options
| author | Marcus Lundblad <ml@update.uu.se> | 2022-01-25 22:32:40 +0100 |
|---|---|---|
| committer | Marcus Lundblad <ml@update.uu.se> | 2022-01-30 22:57:43 +0100 |
| commit | 3fc647d9b206720e02d0e4e01610ac7574bee152 (patch) | |
| tree | 9af0e78c0d24457b5ac8e2583810d6c3ec5d465f | |
| parent | 026ebda403cbd1a827ce9344d0af1ff0410e462c (diff) | |
| download | gnome-maps-wip/mlundblad/fix-help-overlay-devel.tar.gz | |
Add Devel suffix when needed for shortcuts .ui resource pathwip/mlundblad/fix-help-overlay-devel
Install the shortcuts overlay using the correct
gresource path when using the development profile.
| -rw-r--r-- | data/meson.build | 12 | ||||
| -rw-r--r-- | data/org.gnome.Maps.data.gresource.xml.in (renamed from data/org.gnome.Maps.data.gresource.xml) | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/data/meson.build b/data/meson.build index fc2c411b..6c3d993a 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,6 +1,16 @@ +data_conf = configuration_data() +if (get_option('profile') == 'development') + data_conf.set('suffix', '/Devel') +else + data_conf.set('suffix', '') +endif gnome.compile_resources( app_id + '.data', - 'org.gnome.Maps.data.gresource.xml', + configure_file( + input: 'org.gnome.Maps.data.gresource.xml.in', + output: 'org.gnome.Maps.data.gresource.xml', + configuration: data_conf + ), gresource_bundle: true, install: true, install_dir: pkgdatadir diff --git a/data/org.gnome.Maps.data.gresource.xml b/data/org.gnome.Maps.data.gresource.xml.in index 5ad801fa..b6586e4a 100644 --- a/data/org.gnome.Maps.data.gresource.xml +++ b/data/org.gnome.Maps.data.gresource.xml.in @@ -44,7 +44,7 @@ <file alias="application.css">gnome-maps.css</file> <file alias="osm-types.json" compressed="true">osm-types.json</file> </gresource> - <gresource prefix="/org/gnome/Maps/gtk"> + <gresource prefix="/org/gnome/Maps@suffix@/gtk"> <file alias="help-overlay.ui" preprocess="xml-stripblanks">ui/help-overlay.ui</file> </gresource> </gresources> |