system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 02:35:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: don't install NetworkManager.pc when libnm-glib is disabled

Browse source
This commit is contained in:
Lubomir Rintel 2018-01-15 15:35:36 +01:00
parent 07d8431ae5
commit bfff3ecfb0
3 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -141,7 +141,9 @@ DISTCLEANFILES += intltool-extract intltool-merge intltool-update
###############################################################################
if WITH_LEGACY_LIBRARIES
pkgconfig_DATA += NetworkManager.pc
endif
###############################################################################

15
libnm-glib/meson.build
View file

@ -276,3 +276,18 @@ run_target(
if enable_tests
subdir('tests')
endif
pkg.generate(
version: nm_version,
name: nm_name,
description: 'System for maintaining active network connection',
filebase: nm_name,
subdirs: nm_name,
requires: '',
variables: [
'exec_prefix=${prefix}',
'libgnome_serverdir=' + nm_libexecdir,
'plugindir=' + nm_pkglibdir,
'configdir=' + nm_pkgconfdir
]
)

15
meson.build
View file

@ -853,21 +853,6 @@ if enable_docs
subdir('docs')
endif
pkg.generate(
version: nm_version,
name: nm_name,
description: 'System for maintaining active network connection',
filebase: nm_name,
subdirs: nm_name,
requires: '',
variables: [
'exec_prefix=${prefix}',
'libgnome_serverdir=' + nm_libexecdir,
'plugindir=' + nm_pkglibdir,
'configdir=' + nm_pkgconfdir
]
)
config = 'config.h'
configure_file(