Use DBUS_CONFDIR variable instead of DBUS_DATADIR

diff --git a/Makefile.am b/Makefile.am
index f5158ed..97d41d0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,9 +36,9 @@ gsupplicant_sources = gsupplicant/gsupplicant.h gsupplicant/dbus.h \
                        gsupplicant/supplicant.c gsupplicant/dbus.c
 
 if DATAFILES
-dbusdir = @DBUS_DATADIR@
+dbusconfdir = @DBUS_CONFDIR@
 
-dbus_DATA = src/connman.conf
+dbusconf_DATA = src/connman.conf
 endif
 
 plugin_LTLIBRARIES =

diff --git a/configure.ac b/configure.ac
index b2dcc80..6d96066 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -288,15 +288,15 @@ AC_CHECK_LIB(dbus-1, dbus_watch_get_unix_fd, dummy=yes,
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
-AC_ARG_WITH(dbusconf, AC_HELP_STRING([--with-dbusconf=PATH],
+AC_ARG_WITH(dbusconfdir, AC_HELP_STRING([--with-dbusconfdir=PATH],
        [path to D-Bus config directory]), [path_dbusconf=${withval}],
                [path_dbusconf="`$PKG_CONFIG --variable=sysconfdir dbus-1`"])
 if (test -z "${path_dbusconf}"); then
-       DBUS_DATADIR="${sysconfdir}/dbus-1/system.d"
+       DBUS_CONFDIR="${sysconfdir}/dbus-1/system.d"
 else
-       DBUS_DATADIR="${path_dbusconf}/dbus-1/system.d"
+       DBUS_CONFDIR="${path_dbusconf}/dbus-1/system.d"
 fi
-AC_SUBST(DBUS_DATADIR)
+AC_SUBST(DBUS_CONFDIR)
 
 AC_ARG_ENABLE(polkit,
        AC_HELP_STRING([--enable-polkit], [enable PolicyKit support]),