colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-07-27 Dan Williams <dcbw@redhat.com>

Browse Source 
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
This commit is contained in:
Dan Williams
2008-07-27 20:23:51 +00:00
parent 8dfcafa6bb
commit d4b3721c8d
6 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vpn-daemons/vpnc/ChangeLog
View File

@@ -1,3 +1,10 @@
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> 2008-07-17 Tambet Ingo <tambet@gmail.com>
* properties/nm-vpnc.c (vpnc_plugin_ui_class_init): Don't add empty * properties/nm-vpnc.c (vpnc_plugin_ui_class_init): Don't add empty

6
vpn-daemons/vpnc/Makefile.am
View File

@@ -22,10 +22,8 @@ icondir = $(datadir)/icons/hicolor/48x48/apps
icon_DATA = gnome-mime-application-x-cisco-vpn-settings.png icon_DATA = gnome-mime-application-x-cisco-vpn-settings.png
endif endif
nm-vpnc-service.name: $(srcdir)/nm-vpnc-service.name.in Makefile nm-vpnc-service.name: $(srcdir)/nm-vpnc-service.name.in
sed -e 's|[@]BINDIR[@]|$(bindir)|g' \ sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' $< >$@
< $(srcdir)/nm-vpnc-service.name.in \
> nm-vpnc-service.name
EXTRA_DIST = nm-vpnc-service.name.in \ EXTRA_DIST = nm-vpnc-service.name.in \
$(dbusservice_DATA) \ $(dbusservice_DATA) \

2
vpn-daemons/vpnc/nm-vpnc-service.name.in
View File

@@ -1,7 +1,7 @@
[VPN Connection] [VPN Connection]
name=vpnc name=vpnc
service=org.freedesktop.NetworkManager.vpnc service=org.freedesktop.NetworkManager.vpnc
program=@BINDIR@/nm-vpnc-service program=@LIBEXECDIR@/nm-vpnc-service
[GNOME] [GNOME]
auth-dialog=nm-vpnc-auth-dialog auth-dialog=nm-vpnc-auth-dialog

5
vpn-daemons/vpnc/properties/Makefile.am
View File

@@ -1,6 +1,5 @@
plugindir = $(libdir)/NetworkManager
plugin_LTLIBRARIES = libnm-vpnc-properties.la
lib_LTLIBRARIES = libnm-vpnc-properties.la
libnm_vpnc_properties_la_SOURCES = \ libnm_vpnc_properties_la_SOURCES = \
pcf-file.c \ pcf-file.c \

3
vpn-daemons/vpnc/src/Makefile.am
View File

@@ -4,7 +4,6 @@ AM_CPPFLAGS = \
$(DBUS_CFLAGS) \ $(DBUS_CFLAGS) \
$(GTHREAD_CFLAGS) \ $(GTHREAD_CFLAGS) \
$(NM_UTILS_CFLAGS) \ $(NM_UTILS_CFLAGS) \
-Wall \
-DDBUS_API_SUBJECT_TO_CHANGE \ -DDBUS_API_SUBJECT_TO_CHANGE \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DBINDIR=\"$(bindir)\" \ -DBINDIR=\"$(bindir)\" \
@@ -16,7 +15,7 @@ AM_CPPFLAGS = \
-DLOCALSTATEDIR=\""$(localstatedir)"\" \ -DLOCALSTATEDIR=\""$(localstatedir)"\" \
-DDATADIR=\"$(datadir)\" -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_SOURCES = \
nm-vpnc-service.c \ nm-vpnc-service.c \

2
vpn-daemons/vpnc/src/nm-vpnc-service.c
View File

@@ -30,7 +30,7 @@ static const char *vpnc_binary_paths[] =
NULL 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 */ #define NM_VPNC_UDP_ENCAPSULATION_PORT 0 /* random port */
typedef struct { typedef struct {