Binutils has a "contrib" subdirectory - thus flattening cannot happen without renaming the upper level contrib directory in a first pass. Also, don't record this move and remove any keyword expansion.
These bits are taken from the FSF anoncvs repo on 11-Oct-2002 22:39:35 PDT.