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