From 653e14db5da70f46f5cf2105e1bf2d051be25b03 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sun, 27 Jul 2008 20:24:28 +0000 Subject: [PATCH] 2008-07-27 Dan Williams Patch from Michael Biebl * 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 --- vpn-daemons/pptp/ChangeLog | 7 +++++++ vpn-daemons/pptp/Makefile.am | 6 ++---- vpn-daemons/pptp/nm-pptp-service.name.in | 2 +- vpn-daemons/pptp/properties/Makefile.am | 3 ++- vpn-daemons/pptp/src/Makefile.am | 6 ++---- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/vpn-daemons/pptp/ChangeLog b/vpn-daemons/pptp/ChangeLog index 66c2067904..530f610ac2 100644 --- a/vpn-daemons/pptp/ChangeLog +++ b/vpn-daemons/pptp/ChangeLog @@ -1,3 +1,10 @@ +2008-07-27 Dan Williams + + Patch from Michael Biebl + + * Move service to $LIBEXECDIR, remove unneeded compilation flags, move + properties plugin to $LIBDIR/NetworkManager + 2008-07-21 Dan Williams * src/nm-pptp-service.c diff --git a/vpn-daemons/pptp/Makefile.am b/vpn-daemons/pptp/Makefile.am index 10e60c3c5e..df8e8f57ba 100644 --- a/vpn-daemons/pptp/Makefile.am +++ b/vpn-daemons/pptp/Makefile.am @@ -22,10 +22,8 @@ icondir = $(datadir)/icons/hicolor/48x48/apps 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) \ diff --git a/vpn-daemons/pptp/nm-pptp-service.name.in b/vpn-daemons/pptp/nm-pptp-service.name.in index 8fcb113936..b0cf2b0176 100644 --- a/vpn-daemons/pptp/nm-pptp-service.name.in +++ b/vpn-daemons/pptp/nm-pptp-service.name.in @@ -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 diff --git a/vpn-daemons/pptp/properties/Makefile.am b/vpn-daemons/pptp/properties/Makefile.am index f5453afc00..3cf7472fef 100644 --- a/vpn-daemons/pptp/properties/Makefile.am +++ b/vpn-daemons/pptp/properties/Makefile.am @@ -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 \ diff --git a/vpn-daemons/pptp/src/Makefile.am b/vpn-daemons/pptp/src/Makefile.am index b2d01c1418..8bbbcc542a 100644 --- a/vpn-daemons/pptp/src/Makefile.am +++ b/vpn-daemons/pptp/src/Makefile.am @@ -4,7 +4,6 @@ AM_CPPFLAGS = \ $(DBUS_GLIB_CFLAGS) \ $(GTHREAD_CFLAGS) \ $(NM_UTILS_CFLAGS) \ - -Wall \ -DDBUS_API_SUBJECT_TO_CHANGE \ -DG_DISABLE_DEPRECATED \ -DBINDIR=\"$(bindir)\" \ @@ -15,10 +14,9 @@ AM_CPPFLAGS = \ -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 \ -- GitLab