Now able to detect end of make properly.