From b62633b919d481265d3fd75a5d32750dbdc41ddf Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 15 Jun 2007 20:10:09 +0000 Subject: 2007-06-15 Havoc Pennington * dbus/dbus-sysdeps-unix.c (_dbus_append_session_config_file) (_dbus_append_system_config_file): new functions * bus/main.c (main): use _dbus_append_system_config_file() and _dbus_append_session_config_file() * dbus/Makefile.am (INCLUDES): move DBUS_SYSTEM_CONFIG_FILE and DBUS_SESSION_CONFIG_FILE into this makefile --- bus/Makefile.am | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'bus/Makefile.am') diff --git a/bus/Makefile.am b/bus/Makefile.am index 0ba5f341..f7fec99a 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -2,9 +2,7 @@ configdir=$(sysconfdir)/dbus-1 INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS) \ - -DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION \ - -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ - -DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\" + -DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION EFENCE= -- cgit