[network-manager-fortisslvpn] build: install into /usr/lib/NetworkManager/VPN as well

[Lubomir Rintel <lkundrak src gnome org>]

commit 5cc96fab0ea23ccac2707cde68abedd773976fda
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Fri Sep 25 20:11:15 2015 +0200

    build: install into /usr/lib/NetworkManager/VPN as well
    
    That's the preferred location now, though we can't just get rid of the old one yet.

 Makefile.am  |    7 ++++++-
 configure.ac |    3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index debfa45..d09d583 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,9 +9,14 @@ endif
 dbusservicedir = $(sysconfdir)/dbus-1/system.d
 dbusservice_DATA = nm-fortisslvpn-service.conf
 
-nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
+nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
 nmvpnservice_DATA = nm-fortisslvpn-service.name
 
+if WITH_LIBNM_GLIB
+nmvpnoldservicedir = $(sysconfdir)/NetworkManager/VPN
+nmvpnoldservice_DATA = nm-fortisslvpn-service.name
+endif
+
 nm-fortisslvpn-service.name: $(srcdir)/nm-fortisslvpn-service.name.in
        sed -e 's|[ ]LIBEXECDIR[@]|$(libexecdir)|g' \
            -e 's|[ ]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
diff --git a/configure.ac b/configure.ac
index b1b3242..523b056 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,7 +93,8 @@ if test x"$with_gnome" != xno; then
        fi
 fi
 
-NM_COMPILER_WARNINGS
+NM_VPN_SERVICE_DIR=`$PKG_CONFIG --define-variable prefix='\${prefix}' --variable vpnservicedir libnm`
+AC_SUBST(NM_VPN_SERVICE_DIR)
 
 dnl
 dnl Distribution version string