[network-manager-openvpn/nm-0-9-8] Use full paths in .name file



commit 8fd449fd7db85e063d8df7b3540a2d7e033abb56
Author: Dan Winship <danw gnome org>
Date:   Tue Mar 12 15:10:49 2013 -0400

    Use full paths in .name file
    
    Include the full path to the auth-dialog and properties library in the
    .name file, like we already do for the main helper program.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=694768

 Makefile.am                |    4 +++-
 nm-openvpn-service.name.in |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 843e09f..edbe579 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,9 @@ if WITH_GNOME
 endif
 
 nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in
-       sed -e 's|[ ]LIBEXECDIR[@]|$(libexecdir)|g' $< >$@
+       sed -e 's|[ ]LIBEXECDIR[@]|$(libexecdir)|g' \
+           -e 's|[ ]LIBDIR[@]|$(libdir)|g' \
+           $< >$@
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-tests=yes \
diff --git a/nm-openvpn-service.name.in b/nm-openvpn-service.name.in
index bab507e..50b1ba6 100644
--- a/nm-openvpn-service.name.in
+++ b/nm-openvpn-service.name.in
@@ -4,7 +4,7 @@ service=org.freedesktop.NetworkManager.openvpn
 program= LIBEXECDIR@/nm-openvpn-service
 
 [GNOME]
-auth-dialog=nm-openvpn-auth-dialog
-properties=libnm-openvpn-properties
+auth-dialog= LIBEXECDIR@/nm-openvpn-auth-dialog
+properties= LIBDIR@/libnm-openvpn-properties
 supports-external-ui-mode=true
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]