Fix "make install" and tidy up Makefile