summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn (J5) Palmieri <johnp@redhat.com>2006-02-10 21:47:10 +0000
committerJohn (J5) Palmieri <johnp@redhat.com>2006-02-10 21:47:10 +0000
commitf93044676003fdc65fc8a4c36a11e0ca57190c90 (patch)
treed6dd1dbfeba72247698e94eee2bccbdfa4bbb77b
parent7e979ce65b4b7745f1e6e8a94fab8d9289c12a9b (diff)
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>
-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 2beb2ad..a5c85d6 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 e98a027..7f87c25 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: