summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn (J5) Palmieri <johnp@redhat.com>2006-03-17 03:20:14 +0000
committerJohn (J5) Palmieri <johnp@redhat.com>2006-03-17 03:20:14 +0000
commit36e1d8bfc79614617f364306bb168f46e0d4761c (patch)
tree608652686bda4cd7aa4020472f4bbcbbbf23339b
parentfe21c24475602047bdfdfcc60485f618a48036f6 (diff)
Patch from Milosz Derezynski <internalerror at gmail.com>
* configure.in: Output the service directory in the configure summary * dbus-1.pc.in: Add session_bus_services_dir
-rw-r--r--ChangeLog10
-rw-r--r--configure.in1
-rw-r--r--dbus-1.pc.in1
3 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d969e57..926bdda5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-03-16 John (J5) Palmieri <johnp@redhat.com>
+
+ Patch from Milosz Derezynski <internalerror at gmail.com>
+
+ * configure.in:
+ Output the service directory in the configure summary
+
+ * dbus-1.pc.in:
+ Add session_bus_services_dir
+
2006-03-10 Ross Burton <ross@openedhand.com>
* tools/dbus-print-message.c:
diff --git a/configure.in b/configure.in
index 1b56634b..4120281a 100644
--- a/configure.in
+++ b/configure.in
@@ -1483,6 +1483,7 @@ echo "
Session bus socket dir: ${DBUS_SESSION_SOCKET_DIR}
Console auth dir: ${DBUS_CONSOLE_AUTH_DIR}
System bus user: ${DBUS_USER}
+ Session bus services dir: ${EXPANDED_DATADIR}/dbus-1/services
'make check' socket dir: ${TEST_SOCKET_DIR}
"
diff --git a/dbus-1.pc.in b/dbus-1.pc.in
index e243ec92..174d87dd 100644
--- a/dbus-1.pc.in
+++ b/dbus-1.pc.in
@@ -4,6 +4,7 @@ libdir=@libdir@
includedir=@includedir@
system_bus_default_address=@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@
sysconfdir=@EXPANDED_SYSCONFDIR@
+session_bus_services_dir=@EXPANDED_DATADIR@/dbus-1/services
Name: dbus
Description: Free desktop message bus