From e52f9aee79461e70a4be0f60a5b59512fc1d3ffd Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 3 Jul 2008 13:00:41 +0000 Subject: [PATCH] 2008-07-03 Dan Williams * nm-vpnc-service.name.in Makefile.am - Remove paths from .name file (requires applet r776 or later) to fix issues with multilib and magic path substitution in glibc git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3803 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- vpn-daemons/vpnc/ChangeLog | 7 +++++++ vpn-daemons/vpnc/Makefile.am | 2 -- vpn-daemons/vpnc/nm-vpnc-service.name.in | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/vpn-daemons/vpnc/ChangeLog b/vpn-daemons/vpnc/ChangeLog index 202d09c6e..a49954dea 100644 --- a/vpn-daemons/vpnc/ChangeLog +++ b/vpn-daemons/vpnc/ChangeLog @@ -1,3 +1,10 @@ +2008-07-03 Dan Williams + + * nm-vpnc-service.name.in + Makefile.am + - Remove paths from .name file (requires applet r776 or later) to fix + issues with multilib and magic path substitution in glibc + 2008-06-20 Dan Williams Update for changes to the plugin API diff --git a/vpn-daemons/vpnc/Makefile.am b/vpn-daemons/vpnc/Makefile.am index 6f00f98ea..fafcd1792 100644 --- a/vpn-daemons/vpnc/Makefile.am +++ b/vpn-daemons/vpnc/Makefile.am @@ -24,8 +24,6 @@ endif nm-vpnc-service.name: $(srcdir)/nm-vpnc-service.name.in Makefile sed -e 's|[@]BINDIR[@]|$(bindir)|g' \ - -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \ - -e 's|[@]PREFIX[@]|$(prefix)|g' \ < $(srcdir)/nm-vpnc-service.name.in \ > nm-vpnc-service.name diff --git a/vpn-daemons/vpnc/nm-vpnc-service.name.in b/vpn-daemons/vpnc/nm-vpnc-service.name.in index ab7f772e1..bfe9d673d 100644 --- a/vpn-daemons/vpnc/nm-vpnc-service.name.in +++ b/vpn-daemons/vpnc/nm-vpnc-service.name.in @@ -4,5 +4,5 @@ service=org.freedesktop.NetworkManager.vpnc program=@BINDIR@/nm-vpnc-service [GNOME] -auth-dialog=@LIBEXECDIR@/nm-vpnc-auth-dialog -properties=@PREFIX@/${LIB}/libnm-vpnc-properties +auth-dialog=nm-vpnc-auth-dialog +properties=libnm-vpnc-properties