Merge branch 'V5-4-patches' into V5-5-patches

* V5-4-patches:
  Fix make install in man directory for Solaris caused by VPATH oddity.