Commit 653e14db 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@3863 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
parent d4b3721c
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-21 Dan Williams <dcbw@redhat.com> 2008-07-21 Dan Williams <dcbw@redhat.com>
* src/nm-pptp-service.c * src/nm-pptp-service.c
......
...@@ -22,10 +22,8 @@ icondir = $(datadir)/icons/hicolor/48x48/apps ...@@ -22,10 +22,8 @@ icondir = $(datadir)/icons/hicolor/48x48/apps
icon_DATA = gnome-mime-application-x-pptp-settings.png icon_DATA = gnome-mime-application-x-pptp-settings.png
endif endif
nm-pptp-service.name: $(srcdir)/nm-pptp-service.name.in Makefile nm-pptp-service.name: $(srcdir)/nm-pptp-service.name.in
sed -e 's|[@]BINDIR[@]|$(bindir)|g' \ sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' $< >$@
< $(srcdir)/nm-pptp-service.name.in \
> nm-pptp-service.name
EXTRA_DIST = nm-pptp-service.name.in \ EXTRA_DIST = nm-pptp-service.name.in \
$(dbusservice_DATA) \ $(dbusservice_DATA) \
......
[VPN Connection] [VPN Connection]
name=pptp name=pptp
service=org.freedesktop.NetworkManager.pptp service=org.freedesktop.NetworkManager.pptp
program=@BINDIR@/nm-pptp-service program=@LIBEXECDIR@/nm-pptp-service
[GNOME] [GNOME]
auth-dialog=nm-pptp-auth-dialog auth-dialog=nm-pptp-auth-dialog
......
lib_LTLIBRARIES = libnm-pptp-properties.la plugindir = $(libdir)/NetworkManager
plugin_LTLIBRARIES = libnm-pptp-properties.la
libnm_pptp_properties_la_SOURCES = \ libnm_pptp_properties_la_SOURCES = \
nm-pptp.c \ nm-pptp.c \
......
...@@ -4,7 +4,6 @@ AM_CPPFLAGS = \ ...@@ -4,7 +4,6 @@ AM_CPPFLAGS = \
$(DBUS_GLIB_CFLAGS) \ $(DBUS_GLIB_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)\" \
...@@ -15,10 +14,9 @@ AM_CPPFLAGS = \ ...@@ -15,10 +14,9 @@ AM_CPPFLAGS = \
-DLIBEXECDIR=\""$(libexecdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \
-DLOCALSTATEDIR=\""$(localstatedir)"\" \ -DLOCALSTATEDIR=\""$(localstatedir)"\" \
-DDATADIR=\"$(datadir)\" \ -DDATADIR=\"$(datadir)\" \
-DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\" \ -DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\"
-fPIC
bin_PROGRAMS = nm-pptp-service libexec_PROGRAMS = nm-pptp-service
nm_pptp_service_SOURCES = \ nm_pptp_service_SOURCES = \
nm-pptp-service.c \ nm-pptp-service.c \
......
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