Fixes: #2813 standardizing the way manpages a installed
Fixes: #2814 correcting the way contrib is installed