Makefile changes; not sure why if is not being triggered correctly