diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2021-11-15 09:28:46 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2021-11-15 09:28:46 +0100 |
| commit | 3bc14e3e884c3aa9e142d98dd99eeb02b9c25e5b (patch) | |
| tree | bc22833428283878da7465245ce85686f9ab3724 | |
| parent | 1d13d7a90090d877d81f5fa407013ff4d572fd27 (diff) | |
| parent | e37b8456ac878f9cf41d2a7c857c2281b5c73c75 (diff) | |
| download | NetworkManager-3bc14e3e884c3aa9e142d98dd99eeb02b9c25e5b.tar.gz | |
merge: branch 'lr/pc'
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1012
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | NetworkManager.pc.in | 13 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/libnm-client-impl/libnm.pc.in | 2 |
4 files changed, 2 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index 468e7c2171..23bee4f89c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5619,7 +5619,6 @@ EXTRA_DIST += \ COPYING.LGPL \ COPYING.GFDL \ \ - NetworkManager.pc.in \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ diff --git a/NetworkManager.pc.in b/NetworkManager.pc.in deleted file mode 100644 index 877c344863..0000000000 --- a/NetworkManager.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ -libgnome_serverdir=@libexecdir@ -plugindir=@libdir@/NetworkManager -configdir=@sysconfdir@/NetworkManager - -Name: NetworkManager -Description: System for maintaining active network connection -Requires: -Version: @VERSION@ -Cflags: -I${includedir}/NetworkManager diff --git a/configure.ac b/configure.ac index 89ffef7e0d..2d3bf96267 100644 --- a/configure.ac +++ b/configure.ac @@ -1341,7 +1341,6 @@ docs/api/Makefile docs/api/version.xml docs/libnm/Makefile docs/libnm/version.xml -NetworkManager.pc src/libnm-client-impl/libnm.pc src/libnm-core-public/nm-version-macros.h ]) diff --git a/src/libnm-client-impl/libnm.pc.in b/src/libnm-client-impl/libnm.pc.in index afc5e4d9fe..c65b80df9a 100644 --- a/src/libnm-client-impl/libnm.pc.in +++ b/src/libnm-client-impl/libnm.pc.in @@ -3,6 +3,8 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ vpnservicedir=@nmlibdir@/VPN +plugindir=@libdir@/NetworkManager +configdir=@sysconfdir@/NetworkManager Name: libnm Description: Convenience library for clients of NetworkManager |