Some makefile cleanups and tested the package installation on desktop