Merge "Read shell's PATH rather than make's to avoid warning logspam."