From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 16 Sep 2019 16:11:21 +0000 (-0400)
Subject: charon-nm: Move D-Bus conf file to $(datadir)/dbus-1/system.d
X-Git-Tag: 5.8.2dr1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b0cc5c5cbf48d61598a257051daf0aabac44abb;p=thirdparty%2Fstrongswan.git

charon-nm: Move D-Bus conf file to $(datadir)/dbus-1/system.d

Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.

Closes strongswan/strongswan#150.
---

diff --git a/src/charon-nm/Makefile.am b/src/charon-nm/Makefile.am
index 4abfc743a6..2e0ab958cc 100644
--- a/src/charon-nm/Makefile.am
+++ b/src/charon-nm/Makefile.am
@@ -23,7 +23,7 @@ charon_nm_LDADD = \
 	$(top_builddir)/src/libcharon/libcharon.la \
 	-lm $(PTHREADLIB) $(ATOMICLIB) $(DLLIB) ${nm_LIBS}
 
-dbusservicedir = $(sysconfdir)/dbus-1/system.d
+dbusservicedir = $(datadir)/dbus-1/system.d
 dbusservice_DATA = nm-strongswan-service.conf
 
 EXTRA_DIST = $(dbusservice_DATA)