diff options
| author | L. E. Segovia <amy@centricular.com> | 2024-12-06 14:22:29 -0300 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2024-12-10 17:18:36 +0000 |
| commit | 9406e7317cb18f49d7239d5b384ab43bd9c33f08 (patch) | |
| tree | 066b119de0b0454a5c98f7bca3a4571d54d5ea07 | |
| parent | 872b1536f73173b2b578a09d0de9aeff60ec4b2f (diff) | |
WiX: fix double nesting of bin folder when accessing the WIX5 envvar
See https://github.com/wixtoolset/wix/blob/f440fb317c630e7bc6d4ee4d657a200654e2f876/src/setup/wix-cli/Package.wxs#L21
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1662>
| -rw-r--r-- | cerbero/utils/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cerbero/utils/__init__.py b/cerbero/utils/__init__.py index 385abdb9..fc788294 100644 --- a/cerbero/utils/__init__.py +++ b/cerbero/utils/__init__.py @@ -488,7 +488,7 @@ def get_wix_prefix(config): elif config.cross_compiling(): wix_prefix = 'C:/Program Files/WiX Toolset v5.0/bin' elif 'WIX5' in os.environ: - wix_prefix = os.path.join(os.environ['WIX5'], 'bin') + wix_prefix = os.environ['WIX5'] if not wix_prefix or not os.path.exists(wix_prefix): wix_prefix = 'C:/Program Files%s/WiX Toolset v5.0/bin' wix_prefix_x86 = wix_prefix % ' (x86)' |