Remove unnecessary whitespace.
Fix up Makefile to support building a .deb and being installed standalone.

This commit keeps the ability of installing to a staging directory for making a .deb as well as supporting standalone installs via "make install".