In all cases where you merged a foo/elf/{configure,Makefile} into an
existing foo/{configure,Makefile}, the elf/ one's contents should come
first. That's the existing order of evaluation of the separate files.
Sorry I didn't catch this in looking at your patches.
Thanks,
Roland