2003-09-28 Havoc Pennington <hp@pobox.com>

	* doc/Makefile.am (dbus-specification.html): testing a funky hack
	to work with Debian db2html

diff --git a/ChangeLog b/ChangeLog
index 53472d9..fbe7325 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2003-09-28  Havoc Pennington  <hp@pobox.com>
 
+       * doc/Makefile.am (dbus-specification.html): testing a funky hack
+       to work with Debian db2html
+
+2003-09-28  Havoc Pennington  <hp@pobox.com>
+
        * configure.in: 0.13
 
        * doc/Makefile.am (dbus-test-plan.html): accept nonexistence of

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5ee7cb9..d89befc 100644 (file)
--- 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)