[network-manager-openvpn] build: install into /etc/NetworkManager/VPN as well



commit d4134c4662daf53338eaadce5ff9ce1e969800ab
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Thu Aug 20 12:15:52 2015 +0200

    build: install into /etc/NetworkManager/VPN as well
    
    Also, don't conditionally omit parts that are not built -- user can skip
    installing them even though they were built anyway. libnm should notice and
    skip them at runtime.

 Makefile.am |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d858975..cab3bab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,15 +12,15 @@ dbusservice_DATA = nm-openvpn-service.conf
 nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
 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/' $< >$@
+nmvpnoldservicedir = $(sysconfdir)/NetworkManager/VPN
+nmvpnoldservice_DATA = nm-openvpn-service.name
 endif
+
+nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in
        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]