Improvements to `makefile` and `config.mk`.