[network-manager-iodine/lr/multiple-vpn: 11/17] build: install the service file into /usr/lib too

[Lubomir Rintel <lkundrak src gnome org>]

commit e22828aed304fc977ec22d7d69b86c080fbb297f
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Mon Aug 24 18:02:18 2015 +0200

    build: install the service file into /usr/lib too
    
    It's not really a configuration file and should not be installed into /etc.
    See file-hierarchy(7).
    
    We need the old location for the old property plugin though.

 Makefile.am  |    7 ++++++-
 configure.ac |    3 +++
 2 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3269d3a..24174e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,9 +13,14 @@ endif
 dbusservicedir = $(sysconfdir)/dbus-1/system.d
 dbusservice_DATA = nm-iodine-service.conf
 
-nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
+nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
 nmvpnservice_DATA = nm-iodine-service.name
 
+if WITH_LIBNM_GLIB
+nmvpnoldservicedir = $(sysconfdir)/NetworkManager/VPN
+nmvpnoldservice_DATA = nm-iodine-service.name
+endif
+
 nm-iodine-service.name: $(srcdir)/nm-iodine-service.name.in
        sed -e 's|[ ]LIBEXECDIR[@]|$(libexecdir)|g' \
            -e 's|[ ]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
diff --git a/configure.ac b/configure.ac
index 38faa55..8596102 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,6 +78,9 @@ PKG_CHECK_MODULES(LIBNM, libnm >= 1.1.0)
 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 pkg-config --define-variable prefix='\${prefix}' --variable vpnservicedir 
libnm`
+AC_SUBST(NM_VPN_SERVICE_DIR)
+
 NM_COMPILER_WARNINGS
 
 AC_CONFIG_FILES([