Merge "Fix makefile error."