Merge pull request #10056 from wismill/install/fix-program-suffix