[2.1] Fixed Makefile