mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-13 06:39:00 +08:00
18 lines
1.1 KiB
Diff
18 lines
1.1 KiB
Diff
|
--- a/mesonbuild/modules/pkgconfig.py
|
||
|
|
+++ b/mesonbuild/modules/pkgconfig.py
|
||
|
|
@@ -583,12 +583,8 @@ class PkgConfigModule(ExtensionModule):
|
||
|
|
pcfile = filebase + '.pc'
|
||
|
|
pkgroot = pkgroot_name = kwargs.get('install_dir', default_install_dir)
|
||
|
|
if pkgroot is None:
|
||
|
|
- if mesonlib.is_freebsd():
|
||
|
|
- pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('prefix')), 'libdata', 'pkgconfig')
|
||
|
|
- pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig')
|
||
|
|
- else:
|
||
|
|
- pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('libdir')), 'pkgconfig')
|
||
|
|
- pkgroot_name = os.path.join('{libdir}', 'pkgconfig')
|
||
|
|
+ pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('libdir')), 'pkgconfig')
|
||
|
|
+ pkgroot_name = os.path.join('{libdir}', 'pkgconfig')
|
||
|
|
if not isinstance(pkgroot, str):
|
||
|
|
raise mesonlib.MesonException('Install_dir must be a string.')
|
||
|
|
self._generate_pkgconfig_file(state, deps, subdirs, name, description, url,
|