summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-09-29 02:23:29 +0000
committerHavoc Pennington <hp@redhat.com>2003-09-29 02:23:29 +0000
commit92a2943c91584b0f3361ef6d30b2b92cdd872f40 (patch)
tree328905170a88e704389549fa70e5d187686e0e44
parentb99e916792a37e3ed85d15c615eddd2a097e4eff (diff)
2003-09-28 Havoc Pennington <hp@pobox.com>
* doc/Makefile.am (dbus-specification.html): testing a funky hack to work with Debian db2html
-rw-r--r--ChangeLog5
-rw-r--r--doc/Makefile.am9
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 53472d99..fbe7325d 100644
--- 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 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)