The affected *.make files are produced by the genie build tool. The genie bootstrap build uses pre-generated sources and does not pick up the patched file. We add a pre-build target that first builds genie, then runs genie to regenerate the source files. The main build will then create a fixed genie. ok fcambus@