Always use /etc/dbus-1/system.d for dbus policy documents in Linux, but continue...

diff --git a/Makefile.am b/Makefile.am
index 3842686de7e790db24cb134600b9e7e3d9f7145d..2bbc387c99dd1b78c11633349dcfc50974d87bbe 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -158,24 +158,29 @@ shairport_sync_mpris_test_client_LDADD = lib_mpris_interface.a
 endif
 
 install-exec-hook:
+if BUILD_FOR_LINUX
+DBUS_POLICY_DIR=$(DESTDIR)/etc/dbus-1/system.d
+else
+DBUS_POLICY_DIR=$(DESTDIR)$(sysconfdir)/dbus-1/system.d
+endif
 if INSTALL_CONFIG_FILES
        [ -e $(DESTDIR)$(sysconfdir) ] || mkdir $(DESTDIR)$(sysconfdir)
        cp scripts/shairport-sync.conf $(DESTDIR)$(sysconfdir)/shairport-sync.conf.sample
        [ -f $(DESTDIR)$(sysconfdir)/shairport-sync.conf ] || cp scripts/shairport-sync.conf $(DESTDIR)$(sysconfdir)/shairport-sync.conf
 if USE_DBUS
-       [ -e $(DESTDIR)$(sysconfdir)/dbus-1/system.d ] || mkdir -p $(DESTDIR)$(sysconfdir)/dbus-1/system.d
+       [ -e $(DBUS_POLICY_DIR) ] || mkdir -p $(DBUS_POLICY_DIR)
 if INSTALL_CYGWIN_SERVICE
-       cp scripts/shairport-sync-dbus-policy-cygwin.conf $(DESTDIR)$(sysconfdir)/dbus-1/system.d/shairport-sync-dbus.conf
+       cp scripts/shairport-sync-dbus-policy-cygwin.conf $(DBUS_POLICY_DIR)/shairport-sync-dbus.conf
 else
-       cp scripts/shairport-sync-dbus-policy.conf $(DESTDIR)$(sysconfdir)/dbus-1/system.d/shairport-sync-dbus.conf
+       cp scripts/shairport-sync-dbus-policy.conf $(DBUS_POLICY_DIR)/shairport-sync-dbus.conf
 endif
 endif
 if USE_MPRIS
-       [ -e $(DESTDIR)$(sysconfdir)/dbus-1/system.d ] || mkdir -p $(DESTDIR)$(sysconfdir)/dbus-1/system.d
+       [ -e $(DBUS_POLICY_DIR) ] || mkdir -p $(DBUS_POLICY_DIR)
 if INSTALL_CYGWIN_SERVICE
-       cp scripts/shairport-sync-mpris-policy-cygwin.conf $(DESTDIR)$(sysconfdir)/dbus-1/system.d/shairport-sync-dbus.conf
+       cp scripts/shairport-sync-mpris-policy-cygwin.conf $(DBUS_POLICY_DIR)/shairport-sync-mpris.conf
 else
-       cp scripts/shairport-sync-mpris-policy.conf $(DESTDIR)$(sysconfdir)/dbus-1/system.d/shairport-sync-mpris.conf
+       cp scripts/shairport-sync-mpris-policy.conf $(DBUS_POLICY_DIR)/shairport-sync-mpris.conf
 endif
 endif
 endif

diff --git a/configure.ac b/configure.ac
index d49df6c3c5f0b568cb19d2a8217fe83ea26041c7..81ff44f9352bd6c96bbd3a82b3856136953cf41f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,8 +33,8 @@ if test "x${with_os}" = xopenbsd ; then
  AC_CHECK_LIB([c],[clock_gettime], , AC_MSG_ERROR(libc needed))
 fi
 
+AM_CONDITIONAL([BUILD_FOR_LINUX], [test "x${with_os}" = xlinux ])
 AM_CONDITIONAL([BUILD_FOR_FREEBSD], [test "x${with_os}" = xfreebsd ])
-
 AM_CONDITIONAL([BUILD_FOR_OPENBSD], [test "x${with_os}" = xopenbsd ])