[network-manager-openvpn/lr/libnm: 14/15] fixup! build: allow build without libnm-glib
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openvpn/lr/libnm: 14/15] fixup! build: allow build without libnm-glib
- Date: Wed, 19 Aug 2015 16:42:00 +0000 (UTC)
commit 8917c73bfceb2753a46177a2d14cb9cdbebba526
Author: Thomas Haller <thaller redhat com>
Date: Wed Aug 19 18:25:37 2015 +0200
fixup! build: allow build without libnm-glib
Makefile.am | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 71e1a6c..5f27553 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,9 +13,14 @@ nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
nmvpnservice_DATA = nm-openvpn-service.name
nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in
+if WITH_LIBNM_GLIB
+ cp $< $@
+else
+ sed -e 's/^properties=[ ]PLUGINDIR[@].*/#\0/' $< >$@
+endif
sed -e 's|[ ]LIBEXECDIR[@]|$(libexecdir)|g' \
-e 's|[ ]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
- $< >$@
+ -i $@
DISTCHECK_CONFIGURE_FLAGS = \
--with-tests=yes \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]