ticket:24 Another fix for makefile