A bit ore readability with variables instead of makefile wieirdness
Upstream was right....