diff options
| author | Andrea Pappacoda <andrea@pappacoda.it> | 2022-01-30 17:46:48 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2022-02-01 12:23:06 -0800 |
| commit | 248e6cf4736ef9ec636228da66c28f9be03aa74f (patch) | |
| tree | a67432efd20d40fdbac3ce96b502943da56cb91a /mesonbuild | |
| parent | 5d932f31b985e46a4995d3c02b021cc94bef901d (diff) | |
| download | meson-248e6cf4736ef9ec636228da66c28f9be03aa74f.zip meson-248e6cf4736ef9ec636228da66c28f9be03aa74f.tar.gz meson-248e6cf4736ef9ec636228da66c28f9be03aa74f.tar.bz2 | |
pkgconfig: set libdir only if used
This should address some concerns outlined in
https://github.com/yhirose/cpp-httplib/pull/1182
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 6c5d347..2e985cf 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -347,7 +347,8 @@ class PkgConfigModule(ExtensionModule): ofile.write('prefix={}\n'.format(self._escape(prefix))) if uninstalled: ofile.write('srcdir={}\n'.format(self._escape(srcdir))) - ofile.write('libdir={}\n'.format(self._escape('${prefix}' / libdir))) + if deps.pub_libs or deps.priv_libs: + ofile.write('libdir={}\n'.format(self._escape('${prefix}' / libdir))) ofile.write('includedir={}\n'.format(self._escape('${prefix}' / incdir))) if variables or unescaped_variables: ofile.write('\n') |