Adapt Makefile to new config locations and names.