Makefile: Adjust again

Import changes from mako. Credits to @barome for some new tuning :)