From 248e6cf4736ef9ec636228da66c28f9be03aa74f Mon Sep 17 00:00:00 2001 From: Andrea Pappacoda Date: Sun, 30 Jan 2022 17:46:48 +0100 Subject: pkgconfig: set libdir only if used This should address some concerns outlined in https://github.com/yhirose/cpp-httplib/pull/1182 --- mesonbuild/modules/pkgconfig.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mesonbuild') 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') -- cgit v1.1