Instead of doing this, would it be possible to use the existing PATCH_* mechanism for this patchset? You could easily set these variables conditionally inside an .ifdef. Look at shells/bash for an example. Thomas