From 1519dc6035fc2169603e4a5a4bca7f55eaa01f58 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Thu, 21 Jun 2007 23:47:15 +0000 Subject: [PATCH] 2007-06-21 Christopher Aillon * nm-openvpn-service.name.in: * nm-ppp-starter.name.in: * nm-vpnc-service.name.in: Make the properties library path multilib friendly (#447577) git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2609 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- vpn-daemons/openvpn/ChangeLog | 5 +++++ vpn-daemons/openvpn/nm-openvpn-service.name.in | 6 +++--- vpn-daemons/pptp/ChangeLog | 5 +++++ vpn-daemons/pptp/nm-ppp-starter.name.in | 6 +++--- vpn-daemons/vpnc/ChangeLog | 5 +++++ vpn-daemons/vpnc/nm-vpnc-service.name.in | 6 +++--- 6 files changed, 24 insertions(+), 9 deletions(-) diff --git a/vpn-daemons/openvpn/ChangeLog b/vpn-daemons/openvpn/ChangeLog index c1f9b78ee2..5a5ed87ef9 100644 --- a/vpn-daemons/openvpn/ChangeLog +++ b/vpn-daemons/openvpn/ChangeLog @@ -1,3 +1,8 @@ +2007-06-21 Christopher Aillon + + * nm-openvpn-service.name.in: + Make the properties library path multilib friendly (#447577) + 2007-04-02 Dan Williams Patch from Christian Persch diff --git a/vpn-daemons/openvpn/nm-openvpn-service.name.in b/vpn-daemons/openvpn/nm-openvpn-service.name.in index d830aa1b82..3b11d4d15b 100644 --- a/vpn-daemons/openvpn/nm-openvpn-service.name.in +++ b/vpn-daemons/openvpn/nm-openvpn-service.name.in @@ -1,8 +1,8 @@ [VPN Connection] name=openvpn service=org.freedesktop.NetworkManager.openvpn -program=@BINDIR@/nm-openvpn-service +program=@bindir@/nm-openvpn-service [GNOME] -auth-dialog=@LIBEXECDIR@/nm-openvpn-auth-dialog -properties=@LIBDIR@/libnm-openvpn-properties +auth-dialog=@libexecdir@/nm-openvpn-auth-dialog +properties=@prefix@/${LIB}/libnm-openvpn-properties diff --git a/vpn-daemons/pptp/ChangeLog b/vpn-daemons/pptp/ChangeLog index de6e3b8df5..93e163aeac 100644 --- a/vpn-daemons/pptp/ChangeLog +++ b/vpn-daemons/pptp/ChangeLog @@ -1,3 +1,8 @@ +2007-06-21 Christopher Aillon + + * nm-ppp-starter.name.in: + Make the properties library path multilib friendly (#447577) + 2007-06-13 Christopher Aillon Patch from Christian Persch diff --git a/vpn-daemons/pptp/nm-ppp-starter.name.in b/vpn-daemons/pptp/nm-ppp-starter.name.in index 30251f8feb..ffc99f0848 100644 --- a/vpn-daemons/pptp/nm-ppp-starter.name.in +++ b/vpn-daemons/pptp/nm-ppp-starter.name.in @@ -1,8 +1,8 @@ [VPN Connection] name=ppp service=org.freedesktop.NetworkManager.ppp_starter -program=@BINDIR@/nm-ppp-starter +program=@bindir@/nm-ppp-starter [GNOME] -auth-dialog=@LIBEXECDIR@/nm-ppp-auth-dialog -properties=@LIBDIR@/libnm-ppp-properties +auth-dialog=@libexecdir@/nm-ppp-auth-dialog +properties=@prefix@/${LIB}/libnm-ppp-properties diff --git a/vpn-daemons/vpnc/ChangeLog b/vpn-daemons/vpnc/ChangeLog index 0947dee371..b5d91e232d 100644 --- a/vpn-daemons/vpnc/ChangeLog +++ b/vpn-daemons/vpnc/ChangeLog @@ -1,3 +1,8 @@ +2007-06-21 Christopher Aillon + + * nm-vpnc-service.name.in: + Make the properties library path multilib friendly (#447577) + 2007-06-11 Christopher Aillon * properties/nm-vpnc-dialog.glade: diff --git a/vpn-daemons/vpnc/nm-vpnc-service.name.in b/vpn-daemons/vpnc/nm-vpnc-service.name.in index fa2e0b7562..3c41c05393 100644 --- a/vpn-daemons/vpnc/nm-vpnc-service.name.in +++ b/vpn-daemons/vpnc/nm-vpnc-service.name.in @@ -1,8 +1,8 @@ [VPN Connection] name=vpnc service=org.freedesktop.NetworkManager.vpnc -program=@BINDIR@/nm-vpnc-service +program=@bindir@/nm-vpnc-service [GNOME] -auth-dialog=@LIBEXECDIR@/nm-vpnc-auth-dialog -properties=@LIBDIR@/libnm-vpnc-properties +auth-dialog=@libexecdir@/nm-vpnc-auth-dialog +properties=@prefix@/${LIB}/libnm-vpnc-properties