fixup_buildsystem.diff
