shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

meson: actually honor pkgconfig*dir options (#9841)

Browse Source 
both were silently ignored leading to some of the pkg-config files
ending up in the wrong place
This commit is contained in:
Benedikt Morbach 2018-08-10 04:59:54 +02:00 committed by Yu Watanabe
parent cf3872bd28
commit a95696e33d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -90,8 +90,8 @@ if rootlibdir == ''
endif endif
# Dirs of external packages # Dirs of external packages
pkgconfigdatadir = join_paths(datadir, 'pkgconfig') pkgconfigdatadir = get_option('pkgconfigdatadir') == '' ? join_paths(datadir, 'pkgconfig') : get_option('pkgconfigdatadir')
pkgconfiglibdir = join_paths(libdir, 'pkgconfig') pkgconfiglibdir = get_option('pkgconfiglibdir') == '' ? join_paths(libdir, 'pkgconfig') : get_option('pkgconfiglibdir')
polkitpolicydir = join_paths(datadir, 'polkit-1/actions') polkitpolicydir = join_paths(datadir, 'polkit-1/actions')
polkitrulesdir = join_paths(datadir, 'polkit-1/rules.d') polkitrulesdir = join_paths(datadir, 'polkit-1/rules.d')
polkitpkladir = join_paths(localstatedir, 'lib/polkit-1/localauthority/10-vendor.d') polkitpkladir = join_paths(localstatedir, 'lib/polkit-1/localauthority/10-vendor.d')

2
meson_options.txt
View File

@ -130,7 +130,7 @@ option('dbussessionservicedir', type : 'string',
description : 'D-Bus session service directory') description : 'D-Bus session service directory')
option('dbussystemservicedir', type : 'string', option('dbussystemservicedir', type : 'string',
description : 'D-Bus system service directory') description : 'D-Bus system service directory')
option('pkgconfigdatadir', type : 'string', value : 'share/pkgconfig', option('pkgconfigdatadir', type : 'string', value : '',
description : 'directory for ') description : 'directory for ')
option('pkgconfiglibdir', type : 'string', value : '', option('pkgconfiglibdir', type : 'string', value : '',
description : 'directory for ') description : 'directory for ')