diff options
| author | Tor Lillqvist <tml@collabora.com> | 2020-10-25 12:05:52 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2020-10-25 14:23:49 +0100 |
| commit | abca9819d95a96c2b8f6d194282f942d6aefbb89 (patch) | |
| tree | ffba20ef79c3cba33210ba8ce60ad03ad40d9d95 /configure.ac | |
| parent | 8a88939e9d66db11c0f0945bdbabaab3c7916218 (diff) | |
Improve PathFormat on WSL: Don't lose a final slash
Change-Id: If0f09dab3a7eb0849aeabcb52bfee39c3a71b719
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104769
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 563fd831f18e..85ff8c3c0f55 100644 --- a/configure.ac +++ b/configure.ac @@ -142,7 +142,21 @@ PathFormat() fi if test "$build_os" = "wsl"; then if test "$fp_count_colon" != "0"; then - formatted_path=$(wslpath -m $(wslpath "$formatted_path")) + formatted_path=$(wslpath "$formatted_path") + local final_slash= + case "$formatted_path" in + */) + final_slash=/ + ;; + esac + formatted_path=$(wslpath -m $formatted_path) + case "$formatted_path" in + */) + ;; + *) + formatted_path="$formatted_path"$final_slash + ;; + esac else formatted_path=$(wslpath -m "$formatted_path") fi |