Improvements to generated pkg-config file