Small makefile improvements

Simple changes to make builds easier when binary paths are different.

Cheers,
Simon