dbus/doc Makefile.am,1.9,1.10

[Havoc Pennington]

Update of /cvs/dbus/dbus/doc
In directory pdx:/tmp/cvs-serv21616/doc

Modified Files:
	Makefile.am 
Log Message:
2003-09-28  Havoc Pennington  <hp@pobox.com>

	* configure.in: 0.13

	* doc/Makefile.am (dbus-test-plan.html): accept nonexistence of
	stylesheet-images for benefit of Debian
	
	Change back to using filesystem-linked sockets for the system
	bus, so only root can create the default system bus address.
	
	* bus/system.conf.in: change to use
	DBUS_SYSTEM_BUS_DEFAULT_ADDRESS

	* dbus/Makefile.am (INCLUDES): remove DBUS_SYSTEM_BUS_PATH define
	from here.

	* configure.in: define DBUS_SYSTEM_BUS_DEFAULT_ADDRESS
	here, and AC_DEFINE DBUS_SYSTEM_PATH



Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/doc/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.am	29 Jun 2003 15:35:06 -0000	1.9
+++ Makefile.am	29 Sep 2003 01:43:52 -0000	1.10
@@ -11,15 +11,15 @@
 endif
 
 dbus-specification.html: dbus-specification.sgml
-	$(DB2HTML) -o . --nochunks $< &&	\
-	rm -r $(srcdir)/dbus-specification/stylesheet-images &&		\
-	(if test -d $(srcdir)/dbus-specification ; then	\
+	$(DB2HTML) -o . --nochunks $< &&				\
+	rm -rf $(srcdir)/dbus-specification/stylesheet-images &&	\
+	(if test -d $(srcdir)/dbus-specification ; then			\
 	rmdir $(srcdir)/dbus-specification ; fi)
 
 dbus-test-plan.html: dbus-test-plan.sgml
-	$(DB2HTML) -o . --nochunks $< &&		\
-	rm -r $(srcdir)/dbus-test-plan/stylesheet-images &&		\
-	(if test -d $(srcdir)/dbus-test-plan ; then	\
+	$(DB2HTML) -o . --nochunks $< &&			\
+	rm -rf $(srcdir)/dbus-test-plan/stylesheet-images &&	\
+	(if test -d $(srcdir)/dbus-test-plan ; then		\
 	rmdir $(srcdir)/dbus-test-plan ; fi)
 
 maintainer-clean-local: