Updated makefile based on cneira bug report feedback