diff make/sanity-rules.gmk @ 142:382219a27386

6727046: Add message when docs are skipped in control build 6864011: typo? in top level Makefile: DAYE_STAMP Reviewed-by: jjg
author ohair
date Wed, 18 Nov 2009 16:41:09 -0800
parents c4523c6f8204
children 412712f77af6
line wrap: on
line diff
--- a/make/sanity-rules.gmk	Mon Nov 02 00:03:32 2009 -0800
+++ b/make/sanity-rules.gmk	Wed Nov 18 16:41:09 2009 -0800
@@ -204,13 +204,9 @@
 	   "" >> $(WARNING_FILE)
   endif
 endif
-ifndef OPENJDK
-  ifdef NO_DOCS
-	@$(ECHO) "WARNING: Your build environment has the variable NO_DOCS\n" \
-	   "        defined. This will result in a development-only\n" \
-	   "        build of the JDK, lacking the documentation.\n" \
+ifeq ($(GENERATE_DOCS),false)
+	@$(ECHO) "WARNING: This build does not include running javadoc.\n" \
 	   "" >> $(WARNING_FILE)
-  endif
 endif
 ifdef NO_IMAGES
 	@$(ECHO) "WARNING: Your build environment has the variable NO_IMAGES\n" \
@@ -355,4 +351,4 @@
 .PHONY: sanity settings pre-sanity insane \
 	post-sanity post-sanity-hotspot post-sanity-jdk \
 	post-sanity-install post-sanity-deploy \
-	alt_bootdir bootdir
+	alt_bootdir bootdir environment