Makefile changes to CONFIG_* defines