[network-manager-pptp/nm-0-9-8] Use full paths in .name file
- From: Dan Williams <dcbw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-pptp/nm-0-9-8] Use full paths in .name file
- Date: Mon, 18 Mar 2013 17:32:13 +0000 (UTC)
commit 23b0e4e8bbdc1bb9317e233c010af96c9def9780
Author: Dan Winship <danw gnome org>
Date: Tue Mar 12 15:10:52 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-pptp-service.name.in | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 77c38be..1b21733 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,9 @@ if WITH_GNOME
endif
nm-pptp-service.name: $(srcdir)/nm-pptp-service.name.in
- sed -e 's|[ ]LIBEXECDIR[@]|$(libexecdir)|g' $< >$@
+ sed -e 's|[ ]LIBEXECDIR[@]|$(libexecdir)|g' \
+ -e 's|[ ]LIBDIR[@]|$(libdir)|g' \
+ $< >$@
DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes
diff --git a/nm-pptp-service.name.in b/nm-pptp-service.name.in
index 9ee79b8..0936a9a 100644
--- a/nm-pptp-service.name.in
+++ b/nm-pptp-service.name.in
@@ -4,6 +4,6 @@ service=org.freedesktop.NetworkManager.pptp
program= LIBEXECDIR@/nm-pptp-service
[GNOME]
-auth-dialog=nm-pptp-auth-dialog
-properties=libnm-pptp-properties
+auth-dialog= LIBEXECDIR@/nm-pptp-auth-dialog
+properties= LIBDIR@/libnm-pptp-properties
supports-external-ui-mode=true
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]