Improve Makefile semantics

With thanks to @paultag