--- a/usr/src/README.build	Fri Oct 29 12:07:58 2010 -0400
+++ b/usr/src/README.build	Sat Oct 30 14:53:04 2010 -0400
@@ -109,6 +109,9 @@
     we can clobber our sparc build and rebuild on x86 (or vice versa),
     yielding two fully built proto areas.
 
+    If ANT_SKIP_JAVADOC is set (to any value), javadoc generation will
+    be skipped, speeding up the build process somewhat.
+
   Make targets:
 
     'make' or 'make all' will just do a build.

--- a/usr/src/java/build-common.xml	Fri Oct 29 12:07:58 2010 -0400
+++ b/usr/src/java/build-common.xml	Sat Oct 30 14:53:04 2010 -0400
@@ -199,7 +199,7 @@
 		</javadoc>
 	</presetdef>
 
-	<target name="javadoc" unless="quick">
+	<target name="javadoc" unless="env.ANT_SKIP_JAVADOC">
 		<javadoc.default />
 	</target>
 
@@ -223,7 +223,8 @@
 	<macrodef name="install.javadoc">
 		<sequential>
 			<copy todir="${proto.javadoc}">
-				<fileset dir="${proj.javadoc}" />
+				<fileset dir="${proj.javadoc}"
+				    erroronmissingdir="false"/>
 			</copy>
 		</sequential>
 	</macrodef>

--- a/usr/src/pkg/manifests/system-management-visual-panels-doc.mf.sh	Fri Oct 29 12:07:58 2010 -0400
+++ b/usr/src/pkg/manifests/system-management-visual-panels-doc.mf.sh	Sat Oct 30 14:53:04 2010 -0400
@@ -35,3 +35,4 @@
 # just grep for those in $PROTO_DOC
 echo "$PROTO_DOC" | sed 's#/\(usr/\)# \1#' | read base docprefix
 pkgsend generate "$base" | ggrep -F "path=$docprefix"
+exit 0