Remove MAKE as a config option and roll it into SHELL.