[network-manager-openswan/nm-0-9-8] Fix path to connection-editor plugin in service file



commit db4fff74c3639a534a01205a58c0a983236a5b29
Author: Dan Winship <danw gnome org>
Date:   Mon Jun 10 13:23:32 2013 -0300

    Fix path to connection-editor plugin in service file

 Makefile.am                 |    4 +++-
 nm-openswan-service.name.in |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4d2c8da..1cec43d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,9 @@ icondir = $(datadir)/icons/hicolor/48x48/apps
 endif
 
 nm-openswan-service.name: $(srcdir)/nm-openswan-service.name.in
-       sed -e 's|[ ]LIBEXECDIR[@]|$(libexecdir)|g' $< >$@
+       sed -e 's|[ ]LIBEXECDIR[@]|$(libexecdir)|g' \
+           -e 's|[ ]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
+           $< >$@
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes
 
diff --git a/nm-openswan-service.name.in b/nm-openswan-service.name.in
index 114bb58..6dbf9ff 100644
--- a/nm-openswan-service.name.in
+++ b/nm-openswan-service.name.in
@@ -4,6 +4,6 @@ service=org.freedesktop.NetworkManager.openswan
 program= LIBEXECDIR@/nm-openswan-service
 
 [GNOME]
-auth-dialog=nm-openswan-auth-dialog
-properties=libnm-openswan-properties
+auth-dialog= LIBEXECDIR@/nm-openswan-auth-dialog
+properties= PLUGINDIR@/libnm-openswan-properties
 supports-external-ui-mode=true


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