Fixup to install in /usr and correct  libdir