Fixup Makefile after merge.