From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 25 Apr 2018 07:45:07 +0000 (+0200)
Subject: nm: Don't hardcode install path for .name file
X-Git-Tag: 5.6.3dr2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e5c00b7c772d7b452f4d8b04768624f9daa1ffb;p=thirdparty%2Fstrongswan.git

nm: Don't hardcode install path for .name file
---

diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am
index 2b022bf870..9b8c6765a3 100644
--- a/src/frontends/gnome/Makefile.am
+++ b/src/frontends/gnome/Makefile.am
@@ -2,7 +2,6 @@ AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = properties auth-dialog po
 
-nmvpnservicedir = $(prefix)/lib/NetworkManager/VPN
 nmvpnservice_DATA = nm-strongswan-service.name
 
 @INTLTOOL_DESKTOP_RULE@
diff --git a/src/frontends/gnome/configure.ac b/src/frontends/gnome/configure.ac
index 61de54010a..1d774931c3 100644
--- a/src/frontends/gnome/configure.ac
+++ b/src/frontends/gnome/configure.ac
@@ -103,6 +103,9 @@ AC_SUBST(nm_plugindir)
 test x"$enable_nm_absolute_paths" = x"yes" && nm_plugindir_abs="$(nm_plugindir)/"
 AC_SUBST(nm_plugindir_abs)
 
+nmvpnservicedir=$($PKG_CONFIG --variable=vpnservicedir libnm)
+AC_SUBST(nmvpnservicedir)
+
 NM_COMPILER_WARNINGS
 
 AC_CONFIG_FILES([