diff -r 103e268e2d16 -r 0a3821d472a3 jdk/make/java/redist/Makefile
--- a/jdk/make/java/redist/Makefile	Thu Mar 26 16:52:00 2009 -0700
+++ b/jdk/make/java/redist/Makefile	Tue Mar 31 15:27:40 2009 -0700
@@ -251,9 +251,11 @@
 #
 ifdef OPENJDK
 
-include $(BUILDDIR)/common/internal/BinaryPlugs.gmk
+  ifeq ($(IMPORT_BINARY_PLUGS),true)
+    include $(BUILDDIR)/common/internal/BinaryPlugs.gmk
 
-build: import-binary-plugs
+    build: import-binary-plugs
+  endif
 
 else # !OPENJDK