diff --git a/make/scripts/fixpath.sh b/make/scripts/fixpath.sh index 255b41a8680..9c8db7383f2 100644 --- a/make/scripts/fixpath.sh +++ b/make/scripts/fixpath.sh @@ -326,7 +326,9 @@ function convert_path() { suffix="${BASH_REMATCH[6]}" # We only believe this is a path if the first part is an existing directory - if [[ -d "/$firstdir" ]]; then + # and the prefix is not a subdirectory in the current working directory. Remove + # any part leading up to a : or = in the prefix before checking. + if [[ -d "/$firstdir" && ! -d "${prefix##*:}" && ! -d "${prefix##*=}" ]]; then if [[ $ENVROOT == "" ]]; then if [[ $QUIET != true ]]; then echo fixpath: failure: Path "'"$pathmatch"'" cannot be converted to Windows path >&2