charon-nm: Move D-Bus conf file to $(datadir)/dbus-1/system.d master
authorworldofpeace <worldofpeace@protonmail.ch>
Mon, 16 Sep 2019 16:11:21 +0000 (12:11 -0400)
committerTobias Brunner <tobias@strongswan.org>
Tue, 17 Sep 2019 08:33:01 +0000 (10:33 +0200)
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.

src/charon-nm/Makefile.am

index 4abfc74..2e0ab95 100644 (file)
@@ -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)