diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2023-05-04 13:55:11 +0200 |
|---|---|---|
| committer | Marge Bot <marge-bot@gnome.org> | 2023-05-04 12:35:38 +0000 |
| commit | 8a4095308e981bf4200b63618b8f06619b3ae681 (patch) | |
| tree | b269b2af856651d9014b6faaa03213081e675318 | |
| parent | 61b42e53038ca14ca12aa37c9416b3f303139b19 (diff) | |
| download | mutter-8a4095308e981bf4200b63618b8f06619b3ae681.tar.gz | |
build: Use / operator instead of format for Wayland protocol paths
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2985>
| -rw-r--r-- | src/meson.build | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/meson.build b/src/meson.build index 2cbbc0141..2a2767fba 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1055,15 +1055,11 @@ if have_wayland if protocol_type == 'stable' output_base = protocol_name - input = protocols_dir / '@0@/@1@/@2@.xml'.format(protocol_type, - protocol_name, - output_base) + input = protocols_dir / protocol_type / protocol_name / '@0@.xml'.format(output_base) elif protocol_type == 'staging' protocol_version = p.get(2) output_base = '@0@-@1@'.format(protocol_name, protocol_version) - input = protocols_dir / '@0@/@1@/@2@.xml'.format(protocol_type, - protocol_name, - output_base) + input = protocols_dir / protocol_type / protocol_name / '@0@.xml'.format(output_base) elif protocol_type == 'private' output_base = protocol_name input = 'wayland/protocol/@0@.xml'.format(protocol_name) @@ -1076,9 +1072,7 @@ if have_wayland output_base = '@0@-@1@-@2@'.format(protocol_name, protocol_type, protocol_version) - input = protocols_dir / '@0@/@1@/@2@.xml'.format(protocol_type, - protocol_name, - output_base) + input = protocols_dir / protocol_type / protocol_name / '@0@.xml'.format(output_base) endif server_header = custom_target('@0@ server header'.format(output_base), |