NetworkManager r3861 - in trunk/vpn-daemons/openvpn: . properties src
- From: dcbw svn gnome org
- To: svn-commits-list gnome org
- Subject: NetworkManager r3861 - in trunk/vpn-daemons/openvpn: . properties src
- Date: Sun, 27 Jul 2008 20:23:24 +0000 (UTC)
Author: dcbw
Date: Sun Jul 27 20:23:24 2008
New Revision: 3861
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3861&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/openvpn/ChangeLog
trunk/vpn-daemons/openvpn/Makefile.am
trunk/vpn-daemons/openvpn/nm-openvpn-service.name.in
trunk/vpn-daemons/openvpn/properties/Makefile.am
trunk/vpn-daemons/openvpn/src/Makefile.am
trunk/vpn-daemons/openvpn/src/nm-openvpn-service.c
Modified: trunk/vpn-daemons/openvpn/Makefile.am
==============================================================================
--- trunk/vpn-daemons/openvpn/Makefile.am (original)
+++ trunk/vpn-daemons/openvpn/Makefile.am Sun Jul 27 20:23:24 2008
@@ -22,10 +22,8 @@
icon_DATA = gnome-mime-application-x-openvpn-settings.png
endif
-nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in Makefile
- sed -e 's|[ ]BINDIR[@]|$(bindir)|g' \
- < $(srcdir)/nm-openvpn-service.name.in \
- > nm-openvpn-service.name
+nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in
+ sed -e 's|[ ]LIBEXECDIR[@]|$(libexecdir)|g' $< >$@
EXTRA_DIST = nm-openvpn-service.name.in \
$(dbusservice_DATA) \
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 Sun Jul 27 20:23:24 2008
@@ -1,7 +1,7 @@
[VPN Connection]
name=openvpn
service=org.freedesktop.NetworkManager.openvpn
-program= BINDIR@/nm-openvpn-service
+program= LIBEXECDIR@/nm-openvpn-service
[GNOME]
auth-dialog=nm-openvpn-auth-dialog
Modified: trunk/vpn-daemons/openvpn/properties/Makefile.am
==============================================================================
--- trunk/vpn-daemons/openvpn/properties/Makefile.am (original)
+++ trunk/vpn-daemons/openvpn/properties/Makefile.am Sun Jul 27 20:23:24 2008
@@ -1,6 +1,5 @@
-
-
-lib_LTLIBRARIES = libnm-openvpn-properties.la
+plugindir = $(libdir)/NetworkManager
+plugin_LTLIBRARIES = libnm-openvpn-properties.la
libnm_openvpn_properties_la_SOURCES = \
nm-openvpn.c \
Modified: trunk/vpn-daemons/openvpn/src/Makefile.am
==============================================================================
--- trunk/vpn-daemons/openvpn/src/Makefile.am (original)
+++ trunk/vpn-daemons/openvpn/src/Makefile.am Sun Jul 27 20:23:24 2008
@@ -1,7 +1,6 @@
AM_CPPFLAGS = \
$(DBUS_CFLAGS) \
$(NETWORK_MANAGER_CFLAGS) \
- -Wall \
-DDBUS_API_SUBJECT_TO_CHANGE \
-DG_DISABLE_DEPRECATED \
-DBINDIR=\"$(bindir)\" \
@@ -13,7 +12,7 @@
-DLOCALSTATEDIR=\""$(localstatedir)"\" \
-DDATADIR=\"$(datadir)\"
-bin_PROGRAMS = nm-openvpn-service nm-openvpn-service-openvpn-helper
+libexec_PROGRAMS = nm-openvpn-service nm-openvpn-service-openvpn-helper
nm_openvpn_service_SOURCES = \
nm-openvpn-service.c \
Modified: trunk/vpn-daemons/openvpn/src/nm-openvpn-service.c
==============================================================================
--- trunk/vpn-daemons/openvpn/src/nm-openvpn-service.c (original)
+++ trunk/vpn-daemons/openvpn/src/nm-openvpn-service.c Sun Jul 27 20:23:24 2008
@@ -53,7 +53,7 @@
#include "nm-openvpn-service.h"
#include "nm-utils.h"
-#define NM_OPENVPN_HELPER_PATH BINDIR"/nm-openvpn-service-openvpn-helper"
+#define NM_OPENVPN_HELPER_PATH LIBEXECDIR"/nm-openvpn-service-openvpn-helper"
G_DEFINE_TYPE (NMOpenvpnPlugin, nm_openvpn_plugin, NM_TYPE_VPN_PLUGIN)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]