diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2018-01-15 15:35:36 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2018-01-16 12:15:51 +0100 |
| commit | bfff3ecfb0ab918369a7f628b195fa1446edbd7b (patch) | |
| tree | 3837d97c864296c50b1913b330712d885c1d14e0 | |
| parent | 07d8431ae546dc51a87463be8f1f72bac7dc526a (diff) | |
| download | NetworkManager-bfff3ecfb0ab918369a7f628b195fa1446edbd7b.tar.gz | |
build: don't install NetworkManager.pc when libnm-glib is disabled
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | libnm-glib/meson.build | 15 | ||||
| -rw-r--r-- | meson.build | 15 |
3 files changed, 17 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index 5fd761f8e6..dd61b537f6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -141,7 +141,9 @@ DISTCLEANFILES += intltool-extract intltool-merge intltool-update ############################################################################### +if WITH_LEGACY_LIBRARIES pkgconfig_DATA += NetworkManager.pc +endif ############################################################################### diff --git a/libnm-glib/meson.build b/libnm-glib/meson.build index a236ec08bd..eddf983e49 100644 --- a/libnm-glib/meson.build +++ b/libnm-glib/meson.build @@ -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 + ] +) diff --git a/meson.build b/meson.build index e59be17f96..ab0fcbab25 100644 --- a/meson.build +++ b/meson.build @@ -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( |