Modified makefile for a more sensible destdir / prefix variable layout.
Merge branch 'development'

Fixing makefile.