From cf9012cd4ec72546d770f8c29f1b2dbba525e13c Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 3 Jul 2008 13:01:23 +0000 Subject: [PATCH] 2008-07-03 Dan Williams * nm-openvpn-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@3804 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- vpn-daemons/openvpn/ChangeLog | 7 +++++++ vpn-daemons/openvpn/Makefile.am | 2 -- vpn-daemons/openvpn/nm-openvpn-service.name.in | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/vpn-daemons/openvpn/ChangeLog b/vpn-daemons/openvpn/ChangeLog index 11c5c4112..fb21010b4 100644 --- a/vpn-daemons/openvpn/ChangeLog +++ b/vpn-daemons/openvpn/ChangeLog @@ -1,3 +1,10 @@ +2008-07-03 Dan Williams + + * nm-openvpn-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-07-02 Dan Williams * properties/auth-helpers.c diff --git a/vpn-daemons/openvpn/Makefile.am b/vpn-daemons/openvpn/Makefile.am index 6a09044a7..1725afea9 100644 --- a/vpn-daemons/openvpn/Makefile.am +++ b/vpn-daemons/openvpn/Makefile.am @@ -24,8 +24,6 @@ endif nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in Makefile sed -e 's|[@]BINDIR[@]|$(bindir)|g' \ - -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \ - -e 's|[@]PREFIX[@]|$(prefix)|g' \ < $(srcdir)/nm-openvpn-service.name.in \ > nm-openvpn-service.name diff --git a/vpn-daemons/openvpn/nm-openvpn-service.name.in b/vpn-daemons/openvpn/nm-openvpn-service.name.in index 3aa16f8cd..da11f3cce 100644 --- a/vpn-daemons/openvpn/nm-openvpn-service.name.in +++ b/vpn-daemons/openvpn/nm-openvpn-service.name.in @@ -4,6 +4,6 @@ service=org.freedesktop.NetworkManager.openvpn program=@BINDIR@/nm-openvpn-service [GNOME] -auth-dialog=@LIBEXECDIR@/nm-openvpn-auth-dialog -properties=@PREFIX@/${LIB}/libnm-openvpn-properties +auth-dialog=nm-openvpn-auth-dialog +properties=libnm-openvpn-properties