Update architecture specific makefile templates so that they are as close to one-another as possible.