From 065fa15a0a2a6d1074415a38d4a737bf7c2264d3 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 3 Nov 2021 12:04:38 +0100 Subject: [PATCH 1/2] libnm.pc: plugindir & configdir Carry them over from NetworkManager.pc, they're potentially useful. --- src/libnm-client-impl/libnm.pc.in | 2 ++ 1 file changed, 2 insertions(+) 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 From e37b8456ac878f9cf41d2a7c857c2281b5c73c75 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 3 Nov 2021 12:05:04 +0100 Subject: [PATCH 2/2] build: remove NetworkManager.pc It's not installed at least since libnm-glib was dropped. --- Makefile.am | 1 - NetworkManager.pc.in | 13 ------------- configure.ac | 1 - 3 files changed, 15 deletions(-) delete mode 100644 NetworkManager.pc.in 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 ])