Merge aku's makefile changes.