Avoid a recursive make to speed things up a bit.
Move the minor arm-specific logic to a dedicated variable so we can merge its configure logic up a level.