From 916cd5d7ca35f37e2db81da7db07e12fa96ab373 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 21 Oct 2015 12:55:03 +0200 Subject: [PATCH] nm: Move the D-Bus policy to charon-nm It's needed for useful use of charon-nm, unlike the GUI. --- src/charon-nm/Makefile.am | 3 +++ .../gnome => charon-nm}/nm-strongswan-service.conf | 0 src/frontends/gnome/Makefile.am | 7 ++----- 3 files changed, 5 insertions(+), 5 deletions(-) rename src/{frontends/gnome => charon-nm}/nm-strongswan-service.conf (100%) diff --git a/src/charon-nm/Makefile.am b/src/charon-nm/Makefile.am index 6ab7f27c57..5c1591bab7 100644 --- a/src/charon-nm/Makefile.am +++ b/src/charon-nm/Makefile.am @@ -22,3 +22,6 @@ charon_nm_LDADD = \ $(top_builddir)/src/libstrongswan/libstrongswan.la \ $(top_builddir)/src/libcharon/libcharon.la \ -lm $(PTHREADLIB) $(ATOMICLIB) $(DLLIB) ${nm_LIBS} + +dbusservicedir = $(sysconfdir)/dbus-1/system.d +dbusservice_DATA = nm-strongswan-service.conf diff --git a/src/frontends/gnome/nm-strongswan-service.conf b/src/charon-nm/nm-strongswan-service.conf similarity index 100% rename from src/frontends/gnome/nm-strongswan-service.conf rename to src/charon-nm/nm-strongswan-service.conf diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am index 6ea29e0b49..a101995b20 100644 --- a/src/frontends/gnome/Makefile.am +++ b/src/frontends/gnome/Makefile.am @@ -2,9 +2,6 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = properties auth-dialog po -dbusservicedir = $(sysconfdir)/dbus-1/system.d -dbusservice_DATA = nm-strongswan-service.conf - nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN nmvpnservice_DATA = nm-strongswan-service.name @@ -20,8 +17,8 @@ nm-strongswan-service.name: $(srcdir)/nm-strongswan-service.name.in sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|' \ -e 's|[@]CHARON[@]|$(charon)|' $< >$@ -EXTRA_DIST = nm-strongswan-service.name.in \ - $(dbusservice_DATA) \ +EXTRA_DIST = \ + nm-strongswan-service.name.in \ $(appdata_in_files) \ $(appdata_DATA) \ intltool-extract.in \