Cleanup after moving g++ libraries to /usr
Merge pull request #900 from pyhalov/cleanup

Cleanup after moving g++ libraries to /usr