Fixing pkg-config generation

Closes #662