summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--mono/doc/Makefile.am4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2beb2ad9..a5c85d65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-02-10 John (J5) Palmieri <johnp@redhat.com>
+ * mono/doc/Makefile.am: Fix parallel make problem with mono-doc
+ (Bug #4213) Patch from Doug Goldstein <cardoe at gentoo.org>
+
+2006-02-10 John (J5) Palmieri <johnp@redhat.com>
+
* bus/connection.c (bus_connections_expect_reply): Make
pending reply limit not common to all connections (Bug #5416)
Patch from Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
diff --git a/mono/doc/Makefile.am b/mono/doc/Makefile.am
index e98a0277..7f87c25c 100644
--- a/mono/doc/Makefile.am
+++ b/mono/doc/Makefile.am
@@ -22,7 +22,9 @@ noinst_DATA = $(TARGETS)
ASSEMBLER = $(MONODOC) --assemble
UPDATER = $(MONODOC) --update
-dbus-sharp-docs.zip dbus-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
+dbus-sharp-docs.zip: dbus-sharp-docs.tree
+
+dbus-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
$(ASSEMBLER) --ecma $(srcdir)/en -o dbus-sharp-docs
update: