From b99e916792a37e3ed85d15c615eddd2a097e4eff Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 29 Sep 2003 01:43:52 +0000 Subject: 2003-09-28 Havoc Pennington * 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 --- doc/Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'doc/Makefile.am') diff --git a/doc/Makefile.am b/doc/Makefile.am index 891c0209..5ee7cb9f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -11,15 +11,15 @@ all-local: dbus-specification.html dbus-test-plan.html 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: -- cgit