NetworkManager r3804 - trunk/vpn-daemons/openvpn

[dcbw svn gnome org]

Author: dcbw
Date: Thu Jul  3 13:01:23 2008
New Revision: 3804
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3804&view=rev

Log:
2008-07-03  Dan Williams  <dcbw redhat com>

	* 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



Modified:
   trunk/vpn-daemons/openvpn/ChangeLog
   trunk/vpn-daemons/openvpn/Makefile.am
   trunk/vpn-daemons/openvpn/nm-openvpn-service.name.in

Modified: trunk/vpn-daemons/openvpn/Makefile.am
==============================================================================
--- trunk/vpn-daemons/openvpn/Makefile.am	(original)
+++ trunk/vpn-daemons/openvpn/Makefile.am	Thu Jul  3 13:01:23 2008
@@ -24,8 +24,6 @@
 
 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
 

Modified: trunk/vpn-daemons/openvpn/nm-openvpn-service.name.in
==============================================================================
--- trunk/vpn-daemons/openvpn/nm-openvpn-service.name.in	(original)
+++ trunk/vpn-daemons/openvpn/nm-openvpn-service.name.in	Thu Jul  3 13:01:23 2008
@@ -4,6 +4,6 @@
 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