Merge "fix mixing argument in makefile."