Hopefully make the pkg-config files behave correctly.
Merge branch 'master' into cuda