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