Fix pc generated files so that they can be used correctly from cmake
This fix is being upstreamed as well for the next version.