NetworkManager r3863 - in trunk/vpn-daemons/pptp: . properties src

[dcbw svn gnome org]

Author: dcbw
Date: Sun Jul 27 20:24:28 2008
New Revision: 3863
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3863&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/pptp/ChangeLog
   trunk/vpn-daemons/pptp/Makefile.am
   trunk/vpn-daemons/pptp/nm-pptp-service.name.in
   trunk/vpn-daemons/pptp/properties/Makefile.am
   trunk/vpn-daemons/pptp/src/Makefile.am

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

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

Modified: trunk/vpn-daemons/pptp/properties/Makefile.am
==============================================================================
--- trunk/vpn-daemons/pptp/properties/Makefile.am	(original)
+++ trunk/vpn-daemons/pptp/properties/Makefile.am	Sun Jul 27 20:24:28 2008
@@ -1,4 +1,5 @@
-lib_LTLIBRARIES = libnm-pptp-properties.la
+plugindir = $(libdir)/NetworkManager
+plugin_LTLIBRARIES = libnm-pptp-properties.la
 
 libnm_pptp_properties_la_SOURCES = \
 	nm-pptp.c \

Modified: trunk/vpn-daemons/pptp/src/Makefile.am
==============================================================================
--- trunk/vpn-daemons/pptp/src/Makefile.am	(original)
+++ trunk/vpn-daemons/pptp/src/Makefile.am	Sun Jul 27 20:24:28 2008
@@ -4,7 +4,6 @@
 	$(DBUS_GLIB_CFLAGS)						\
 	$(GTHREAD_CFLAGS)					\
 	$(NM_UTILS_CFLAGS)				\
-	-Wall							\
 	-DDBUS_API_SUBJECT_TO_CHANGE				\
 	-DG_DISABLE_DEPRECATED					\
 	-DBINDIR=\"$(bindir)\"					\
@@ -15,10 +14,9 @@
 	-DLIBEXECDIR=\""$(libexecdir)"\"			\
 	-DLOCALSTATEDIR=\""$(localstatedir)"\"		 	\
 	-DDATADIR=\"$(datadir)\"				\
-	-DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\" \
-	-fPIC
+	-DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\" 
 
-bin_PROGRAMS = nm-pptp-service
+libexec_PROGRAMS = nm-pptp-service
 
 nm_pptp_service_SOURCES = \
 				nm-pptp-service.c \