Fix install problems on MacOS X and HP-UX.
PR: 1218,1185
3 files changed