Merge pull request #18436 from komakai:fix-install-name