summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--doc/api/Makefile.am2
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f4b7b0911..38f10554a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-25 Mark Wielaard <mark@klomp.org>
+
+ Fixes bug #28822
+ * doc/api/Makefile.am (create_html): Guard GJDOC invocation with
+ CREATE_API_DOCS
+
2006-11-24 Tania Bento <tbento@redhat.com>
* java/awt/font/TextHitInfo.java
diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am
index 96c586e07..b63b31f34 100644
--- a/doc/api/Makefile.am
+++ b/doc/api/Makefile.am
@@ -36,6 +36,7 @@ clean-local:
create_html:
-$(MKDIR) html > /dev/null 2>&1
+if CREATE_API_DOCS
$(GJDOC) \
-use \
-sourcepath "$(sourcepath)" \
@@ -51,3 +52,4 @@ create_html:
-header $(classpathbox) -footer $(classpathbox) \
-subpackages java:javax:org
touch create_html
+endif