dbus/bus Makefile.am,1.38,1.39

[John Palmieri]

Update of /cvs/dbus/dbus/bus
In directory kemper:/tmp/cvs-serv29038/bus

Modified Files:
	Makefile.am 
Log Message:
* configure.in:
* tools/Makefile.am:
* tools/dbus-launch.c:
* bus/Makefile.am:
  allow --with-dbus-daemondir switch to be used to make the
  daemon install to a seperate bindir like /usr/libexec
  (patch from Brian Cameron <brian dot cameron at sun dot com) 


Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/bus/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- Makefile.am	8 Aug 2006 21:15:56 -0000	1.38
+++ Makefile.am	8 Aug 2006 21:30:31 -0000	1.39
@@ -16,8 +16,6 @@
 	session.conf				\
 	system.conf
 
-bin_PROGRAMS=dbus-daemon
-
 if DBUS_USE_LIBXML
 XML_SOURCES=config-loader-libxml.c
 endif
@@ -79,7 +77,7 @@
 
 ## we use noinst_PROGRAMS not check_PROGRAMS so that we build 
 ## even when not doing "make check"
-noinst_PROGRAMS=$(TESTS) 
+noinst_PROGRAMS=$(TESTS) dbus-daemon
 
 bus_test_SOURCES=				\
 	$(BUS_SOURCES)				\
@@ -91,7 +89,15 @@
 clean-local:
 	/bin/rm *.bb *.bbg *.da *.gcov || true
 
+uninstall-hook:
+	rm -f $(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon
+
 install-data-hook:
+	if test '!' -d $(DESTDIR)$(DBUS_DAEMONDIR); then \
+ 		$(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
+ 		chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
+ 	fi
+	$(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
 	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
 	$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services