dbus/bus Makefile.am,1.30,1.31 session.conf.in,1.7,1.8

[John Palmieri]

Update of /cvs/dbus/dbus/bus
In directory gabe:/tmp/cvs-serv32362/bus

Modified Files:
	Makefile.am session.conf.in 
Log Message:
John (J5) Palmieri  <johnp at redhat.com>

        * dbus/dbus-sysdeps.c (fill_user_info): On errors do not free
        the DBusUserInfo structure since this is passed into the function.
        This would cause a double free when the function that allocated
        the structure would try to free it when an error occured.

        * (bus/session.conf.in, bus/Makefile.am, dbus/configure.in):
        use /usr/share/dbus-1/services instead of /usr/lib/dbus-1.0/services
        for service activation to avoid 32bit/64bit parallel install issues


Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/bus/Makefile.am,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- Makefile.am	30 Jul 2004 05:59:33 -0000	1.30
+++ Makefile.am	25 Oct 2004 18:48:58 -0000	1.31
@@ -92,7 +92,7 @@
 install-data-hook:
 	$(mkinstalldirs) $(DESTDIR)/$(localstatedir)/run/dbus
 	$(mkinstalldirs) $(DESTDIR)/$(configdir)/system.d
-	$(mkinstalldirs) $(DESTDIR)/$(libdir)/dbus-1.0/services
+	$(mkinstalldirs) $(DESTDIR)/$(datadir)/dbus-1/services
 
 #### Init scripts fun
 SCRIPT_IN_FILES=messagebus.in

Index: session.conf.in
===================================================================
RCS file: /cvs/dbus/dbus/bus/session.conf.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- session.conf.in	18 Oct 2004 04:04:12 -0000	1.7
+++ session.conf.in	25 Oct 2004 18:48:58 -0000	1.8
@@ -10,7 +10,7 @@
 
   <listen>unix:tmpdir=@DBUS_SESSION_SOCKET_DIR@</listen>
 
-  <servicedir>@EXPANDED_LIBDIR@/dbus-1.0/services</servicedir>
+  <servicedir>@EXPANDED_DATADIR@/dbus-1/services</servicedir>
 
   <policy context="default">
     <!-- Allow everything to be sent -->