Merge pull request #3569 from arthurschreiber/arthur/fix-windows-issues Fix some issues with generated pkg-config file