Merge changes mistakenly made to `Makefile'.