From 92a2943c91584b0f3361ef6d30b2b92cdd872f40 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 29 Sep 2003 02:23:29 +0000 Subject: 2003-09-28 Havoc Pennington * doc/Makefile.am (dbus-specification.html): testing a funky hack to work with Debian db2html --- ChangeLog | 5 +++++ doc/Makefile.am | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53472d99..fbe7325d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-09-28 Havoc Pennington + + * doc/Makefile.am (dbus-specification.html): testing a funky hack + to work with Debian db2html + 2003-09-28 Havoc Pennington * configure.in: 0.13 diff --git a/doc/Makefile.am b/doc/Makefile.am index 5ee7cb9f..d89befcf 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -10,14 +10,19 @@ if DBUS_DOCS_ENABLED all-local: dbus-specification.html dbus-test-plan.html endif +## Debian db2html outputs to stdout, so we collect stdout and use +## it if we didn't get the proper output + dbus-specification.html: dbus-specification.sgml - $(DB2HTML) -o . --nochunks $< && \ + $(DB2HTML) -o . --nochunks $< > $@.stdout && \ + (test -e $@ && rm -f $@.stdout || mv $@.stdout $@) && \ 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 $< && \ + $(DB2HTML) -o . --nochunks $< > $@.stdout && \ + (test -e $@ && rm -f $@.stdout || mv $@.stdout $@) && \ rm -rf $(srcdir)/dbus-test-plan/stylesheet-images && \ (if test -d $(srcdir)/dbus-test-plan ; then \ rmdir $(srcdir)/dbus-test-plan ; fi) -- cgit