--- a/jdk/make/javax/swing/plaf/Makefile	Mon May 18 10:36:38 2009 -0700
+++ b/jdk/make/javax/swing/plaf/Makefile	Thu May 21 16:29:58 2009 +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