Two patches below.  One to rewrite the phases using modify-phases
syntax, and the other to clean up the mess that 'make install' creates.