sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Use DBUS_CONFDIR variable instead of DBUS_DATADIR

This commit is contained in:
Marcel Holtmann 2010-09-21 19:12:15 +09:00
parent 78842faa30
commit 9415cf5d2f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -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

8
configure.ac
View File

@ -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]),