nm: Move the D-Bus policy to charon-nm

It's needed for useful use of charon-nm, unlike the GUI.
This commit is contained in:
Lubomir Rintel 2015-10-21 12:55:03 +02:00 committed by Tobias Brunner
parent 6a0382e1f2
commit 916cd5d7ca
3 changed files with 5 additions and 5 deletions

View File

@ -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

View File

@ -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 \