[NetworkManager-libreswan/lr/gtk-4.0: 3/7] editor: remove NM_PLUGIN_DIR




commit 0bcae37ba09b78f86d85612335823a38a753516c
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Tue Oct 19 16:53:50 2021 +0200

    editor: remove NM_PLUGIN_DIR
    
    This does nothing, nm_vpn_plugin_utils_load_editor() is more than happy
    with a relative path.

 Makefile.am                             | 2 --
 properties/nm-libreswan-editor-plugin.c | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 89922c0..5ed9317 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,7 +67,6 @@ properties_libutils_la_SOURCES = \
 properties_libutils_la_CPPFLAGS = \
        -DPREFIX=\""$(prefix)"\" \
        -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_BASE \
-       -DNM_PLUGIN_DIR=\"$(NM_PLUGIN_DIR)\" \
        $(common_CFLAGS) \
        $(LIBNM_CFLAGS)
 
@@ -75,7 +74,6 @@ plugin_LTLIBRARIES += properties/libnm-vpn-plugin-libreswan.la
 
 properties_libnm_vpn_plugin_libreswan_la_CFLAGS = \
        -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_BASE \
-       -DNM_PLUGIN_DIR=\"$(NM_PLUGIN_DIR)\" \
        $(common_CFLAGS) \
        $(LIBNM_CFLAGS)
 
diff --git a/properties/nm-libreswan-editor-plugin.c b/properties/nm-libreswan-editor-plugin.c
index 9a2399a..cbe06f9 100644
--- a/properties/nm-libreswan-editor-plugin.c
+++ b/properties/nm-libreswan-editor-plugin.c
@@ -340,7 +340,7 @@ get_editor (NMVpnEditorPlugin *iface, NMConnection *connection, GError **error)
 #ifdef NM_VPN_OLD
                return nm_vpn_editor_new (connection, error);
 #else
-               return nm_vpn_plugin_utils_load_editor (NM_PLUGIN_DIR"/libnm-vpn-plugin-libreswan-editor.so",
+               return nm_vpn_plugin_utils_load_editor ("libnm-vpn-plugin-libreswan-editor.so",
                                                        "nm_vpn_editor_factory_libreswan",
                                                        _call_editor_factory,
                                                        iface,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]