diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2010-09-21 19:12:15 +0900 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2010-09-21 19:12:15 +0900 |
| commit | 9415cf5d2fbf4b76ee6c6147d02b54f1b4ec32b1 (patch) | |
| tree | b7d7053431daf03163548f1128f44ec88cd820ba | |
| parent | 78842faa300a99b45aef2a10fc553ccb165886bc (diff) | |
| download | ofono-9415cf5d2fbf4b76ee6c6147d02b54f1b4ec32b1.tar.bz2 | |
Use DBUS_CONFDIR variable instead of DBUS_DATADIR
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index b8e73663..eda02501 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,9 +22,9 @@ local_headers = $(foreach file,$(include_HEADERS) $(nodist_include_HEADERS), \ if DATAFILES -dbusdir = @DBUS_DATADIR@ +dbusconfdir = @DBUS_CONFDIR@ -dbus_DATA = src/ofono.conf +dbusconf_DATA = src/ofono.conf confdir = $(sysconfdir)/ofono diff --git a/configure.ac b/configure.ac index bd1dacbd..401a9599 100644 --- a/configure.ac +++ b/configure.ac @@ -95,15 +95,15 @@ AC_CHECK_LIB(dbus-1, dbus_connection_can_send_type, 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(udev, AC_HELP_STRING([--disable-udev], [don't use udev support even if available]), |