Previously, pkgconfig files hard-coded the include and lib directory names, breaking the configuration when they were overridden.