NetworkManager r3862 - in trunk/vpn-daemons/vpnc: . properties src

[dcbw svn gnome org]

Author: dcbw
Date: Sun Jul 27 20:23:51 2008
New Revision: 3862
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3862&view=rev

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

	Patch from Michael Biebl <biebl debian org>

	* Move service to $LIBEXECDIR, remove unneeded compilation flags, move
		properties plugin to $LIBDIR/NetworkManager



Modified:
   trunk/vpn-daemons/vpnc/ChangeLog
   trunk/vpn-daemons/vpnc/Makefile.am
   trunk/vpn-daemons/vpnc/nm-vpnc-service.name.in
   trunk/vpn-daemons/vpnc/properties/Makefile.am
   trunk/vpn-daemons/vpnc/src/Makefile.am
   trunk/vpn-daemons/vpnc/src/nm-vpnc-service.c

Modified: trunk/vpn-daemons/vpnc/Makefile.am
==============================================================================
--- trunk/vpn-daemons/vpnc/Makefile.am	(original)
+++ trunk/vpn-daemons/vpnc/Makefile.am	Sun Jul 27 20:23:51 2008
@@ -22,10 +22,8 @@
 icon_DATA = gnome-mime-application-x-cisco-vpn-settings.png
 endif
 
-nm-vpnc-service.name: $(srcdir)/nm-vpnc-service.name.in Makefile
-	sed	-e 's|[ ]BINDIR[@]|$(bindir)|g' \
-		< $(srcdir)/nm-vpnc-service.name.in \
-		> nm-vpnc-service.name
+nm-vpnc-service.name: $(srcdir)/nm-vpnc-service.name.in
+	sed -e 's|[ ]LIBEXECDIR[@]|$(libexecdir)|g' $< >$@
 
 EXTRA_DIST = nm-vpnc-service.name.in \
              $(dbusservice_DATA)  \

Modified: trunk/vpn-daemons/vpnc/nm-vpnc-service.name.in
==============================================================================
--- trunk/vpn-daemons/vpnc/nm-vpnc-service.name.in	(original)
+++ trunk/vpn-daemons/vpnc/nm-vpnc-service.name.in	Sun Jul 27 20:23:51 2008
@@ -1,7 +1,7 @@
 [VPN Connection]
 name=vpnc
 service=org.freedesktop.NetworkManager.vpnc
-program= BINDIR@/nm-vpnc-service
+program= LIBEXECDIR@/nm-vpnc-service
 
 [GNOME]
 auth-dialog=nm-vpnc-auth-dialog

Modified: trunk/vpn-daemons/vpnc/properties/Makefile.am
==============================================================================
--- trunk/vpn-daemons/vpnc/properties/Makefile.am	(original)
+++ trunk/vpn-daemons/vpnc/properties/Makefile.am	Sun Jul 27 20:23:51 2008
@@ -1,6 +1,5 @@
-
-
-lib_LTLIBRARIES = libnm-vpnc-properties.la
+plugindir = $(libdir)/NetworkManager
+plugin_LTLIBRARIES = libnm-vpnc-properties.la
 
 libnm_vpnc_properties_la_SOURCES = \
 	pcf-file.c \

Modified: trunk/vpn-daemons/vpnc/src/Makefile.am
==============================================================================
--- trunk/vpn-daemons/vpnc/src/Makefile.am	(original)
+++ trunk/vpn-daemons/vpnc/src/Makefile.am	Sun Jul 27 20:23:51 2008
@@ -4,7 +4,6 @@
 	$(DBUS_CFLAGS) \
 	$(GTHREAD_CFLAGS) \
 	$(NM_UTILS_CFLAGS) \
-	-Wall \
 	-DDBUS_API_SUBJECT_TO_CHANGE \
 	-DG_DISABLE_DEPRECATED \
 	-DBINDIR=\"$(bindir)\" \
@@ -16,7 +15,7 @@
 	-DLOCALSTATEDIR=\""$(localstatedir)"\" \
 	-DDATADIR=\"$(datadir)\"
 
-bin_PROGRAMS = nm-vpnc-service nm-vpnc-service-vpnc-helper
+libexec_PROGRAMS = nm-vpnc-service nm-vpnc-service-vpnc-helper
 
 nm_vpnc_service_SOURCES = \
 				nm-vpnc-service.c \

Modified: trunk/vpn-daemons/vpnc/src/nm-vpnc-service.c
==============================================================================
--- trunk/vpn-daemons/vpnc/src/nm-vpnc-service.c	(original)
+++ trunk/vpn-daemons/vpnc/src/nm-vpnc-service.c	Sun Jul 27 20:23:51 2008
@@ -30,7 +30,7 @@
 	NULL
 };
 
-#define NM_VPNC_HELPER_PATH		BINDIR"/nm-vpnc-service-vpnc-helper"
+#define NM_VPNC_HELPER_PATH		LIBEXECDIR"/nm-vpnc-service-vpnc-helper"
 #define NM_VPNC_UDP_ENCAPSULATION_PORT	0 /* random port */
 
 typedef struct {