Updated makefile - pushed system dependent variables into config.