Commit d4b3721c authored by Dan Williams's avatar Dan Williams

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



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3862 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
parent 8dfcafa6
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
2008-07-17 Tambet Ingo <tambet@gmail.com>
* properties/nm-vpnc.c (vpnc_plugin_ui_class_init): Don't add empty
......
......@@ -22,10 +22,8 @@ icondir = $(datadir)/icons/hicolor/48x48/apps
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) \
......
[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
......
lib_LTLIBRARIES = libnm-vpnc-properties.la
plugindir = $(libdir)/NetworkManager
plugin_LTLIBRARIES = libnm-vpnc-properties.la
libnm_vpnc_properties_la_SOURCES = \
pcf-file.c \
......
......@@ -4,7 +4,6 @@ AM_CPPFLAGS = \
$(DBUS_CFLAGS) \
$(GTHREAD_CFLAGS) \
$(NM_UTILS_CFLAGS) \
-Wall \
-DDBUS_API_SUBJECT_TO_CHANGE \
-DG_DISABLE_DEPRECATED \
-DBINDIR=\"$(bindir)\" \
......@@ -16,7 +15,7 @@ AM_CPPFLAGS = \
-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 \
......
......@@ -30,7 +30,7 @@ static const char *vpnc_binary_paths[] =
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 {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment