Merge pull request #13603 from tianon/consistent-dest

Make "DEST" a make.sh construct instead of ad-hoc