[network-manager-openvpn/lr/libnm] build: install to a proper service directory
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openvpn/lr/libnm] build: install to a proper service directory
- Date: Wed, 19 Aug 2015 07:07:13 +0000 (UTC)
commit 68458c8c0af0d0495b85618fa27d23b340392560
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Wed Aug 19 09:00:37 2015 +0200
build: install to a proper service directory
Makefile.am | 2 +-
configure.ac | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 71e1a6c..78f23c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ endif
dbusservicedir = $(sysconfdir)/dbus-1/system.d
dbusservice_DATA = nm-openvpn-service.conf
-nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
+nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
nmvpnservice_DATA = nm-openvpn-service.name
nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in
diff --git a/configure.ac b/configure.ac
index 860ed55..aebf47e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,6 +86,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 --variable vpnservicedir libnm`
+AC_SUBST(NM_VPN_SERVICE_DIR)
+
NM_COMPILER_WARNINGS
dnl
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]