Use modified CM Makefile