Fix catalog fixup to allow install loc to not overlap with usr/local.