Tweaks to Matt's changes to make sure it still builds on mac.
It would seem that the OS/X make does not take key-value parameters.