--- 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