log: simplifying makefile since this variable is always set, even if blank.
Merge branch 'master' into next