proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-09 02:48:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: Get the pkg-config variables rather than hardcoding

Browse Source
This commit is contained in:
Richard Hughes 2017-04-19 14:51:59 +01:00
parent e1c9a5c476
commit 2d8a7958b2
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/meson.build
View File

@ -14,7 +14,7 @@ install_data(['org.freedesktop.fwupd.xml'],
) )
install_data(['90-fwupd-devices.rules'], install_data(['90-fwupd-devices.rules'],
install_dir : join_paths(get_option('prefix'), 'lib', 'udev', 'rules.d') install_dir : join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d')
) )
con2 = configuration_data() con2 = configuration_data()
@ -44,10 +44,7 @@ configure_file(
output : 'fwupd-offline-update.service', output : 'fwupd-offline-update.service',
configuration : con2, configuration : con2,
install: true, install: true,
install_dir: join_paths(get_option('prefix'), install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
'lib',
'systemd',
'system'),
) )
# replace @localstatedir@ and @bootdir@ # replace @localstatedir@ and @bootdir@
@ -56,8 +53,5 @@ configure_file(
output : 'fwupd.service', output : 'fwupd.service',
configuration : con2, configuration : con2,
install: true, install: true,
install_dir: join_paths(get_option('prefix'), install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
'lib',
'systemd',
'system'),
) )

2
meson.build
View File

@ -124,6 +124,8 @@ soup = dependency('libsoup-2.4', version : '>= 2.51.92')
gpgme = cc.find_library('gpgme') gpgme = cc.find_library('gpgme')
gpgerror = cc.find_library('libgpg-error') gpgerror = cc.find_library('libgpg-error')
libm = cc.find_library('libm', required: false) libm = cc.find_library('libm', required: false)
systemd = dependency('systemd')
udev = dependency('udev')
if valgrind.found() if valgrind.found()
conf.set('HAVE_VALGRIND', '1') conf.set('HAVE_VALGRIND', '1')