--- old/jdk/make/common/shared/Sanity.gmk	2009-05-14 21:40:53.580843417 +0100
+++ new/jdk/make/common/shared/Sanity.gmk	2009-05-14 21:40:53.389092261 +0100
@@ -1502,6 +1502,7 @@
 # JIBX_LIBS_PATH must be valid
 ######################################################
 sane-jibx:
+ifndef DISABLE_NIMBUS	
 	@if [ ! -r $(subst \,/,$(JIBX_LIBS_PATH))/jibx-run.jar ]; then \
 	  $(ECHO) "ERROR: You do not have access to valid JIBX library files. \n" \
 	    "      Please check your access to \n" \
@@ -1509,6 +1510,7 @@
 	    "      and/or check your value of ALT_JDK_DEVTOOLS_DIR, ALT_JIBX_LIBS_PATH \n" \
 	    "" >> $(ERROR_FILE) ; \
 	fi
+endif
 
 ######################################################
 # MOZILLA_HEADERS_PATH must be valid
--- old/jdk/make/javax/swing/plaf/Makefile	2009-05-14 21:40:54.723380319 +0100
+++ new/jdk/make/javax/swing/plaf/Makefile	2009-05-14 21:40:54.539722875 +0100
@@ -34,7 +34,9 @@
 #
 include FILES.gmk
 AUTO_FILES_JAVA_DIRS = javax/swing/plaf sun/swing com/sun/java/swing/plaf
-SUBDIRS = nimbus
+ifndef DISABLE_NIMBUS
+  SUBDIRS = nimbus
+endif
 
 # Nimbus is handled in its own directory
 AUTO_JAVA_PRUNE = nimbus
--- old/jdk/make/tools/Makefile	2009-05-14 21:40:55.767967454 +0100
+++ new/jdk/make/tools/Makefile	2009-05-14 21:40:55.589996418 +0100
@@ -51,9 +51,12 @@
   makeclasslist             \
   strip_properties          \
   spp                       \
-  swing-nimbus              \
   CharsetMapping
 
+ifndef DISABLE_NIMBUS
+  SUBDIRS += swing-nimbus
+endif
+
 all build clean clobber::
 	$(SUBDIRS-loop)