Merge pull request #2804 from tonk/devel

Fixed the installation of library directories