[network-manager-openswan/lr/libnm: 10/10] build: install into /usr/lib/NetworkManager/VPN as well

[Lubomir Rintel <lkundrak src gnome org>]

commit cfba15dde6526b328c8898888015674a8381cecb
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Fri Aug 21 11:26:23 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, 9 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 536f705..1292e69 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,9 +9,14 @@ endif
 dbusservicedir = $(sysconfdir)/dbus-1/system.d
 dbusservice_DATA = nm-openswan-service.conf
 
-nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
+nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
 nmvpnservice_DATA = nm-openswan-service.name
 
+if WITH_LIBNM_GLIB
+nmvpnoldservicedir = $(sysconfdir)/NetworkManager/VPN
+nmvpnoldservice_DATA = nm-openswan-service.name
+endif
+
 nm-openswan-service.name: $(srcdir)/nm-openswan-service.name.in
        sed -e 's|[ ]LIBEXECDIR[@]|$(libexecdir)|g' \
            -e 's|[ ]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
diff --git a/configure.ac b/configure.ac
index fef58c2..77c2e3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,6 +99,9 @@ PKG_CHECK_MODULES(LIBNM, libnm >= 0.9.11)
 LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2"
 LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2"
 
+NM_VPN_SERVICE_DIR=`$PKG_CONFIG --define-variable prefix='\${prefix}' --variable vpnservicedir libnm`
+AC_SUBST(NM_VPN_SERVICE_DIR)
+
 NM_COMPILER_WARNINGS
 
 AC_CONFIG_FILES([