 +  XAWT_SUBDIR     =
  endif
  
- ifndef OPENJDK
-@@ -79,7 +79,7 @@ else
+ ifeq ($(PLATFORM), macosx)
+@@ -87,7 +87,7 @@
  endif
  SUBDIRS_desktop    = audio $(RENDER_SUBDIR) image \
-                      $(DISPLAY_LIBS) $(DGA_SUBDIR) \
+                      $(LWAWT_PRE_SUBDIR) $(DISPLAY_LIBS) $(DGA_SUBDIR) $(LWAWT_SUBDIR) \
 -                     jawt font jpeg cmm $(DISPLAY_TOOLS) beans
 +                     font jpeg cmm $(DISPLAY_TOOLS) beans
  SUBDIRS_management = management

-endif
 
 .PHONY: sources 
--- openjdk/jdk/make/sun/Makefile.khem	2012-08-10 19:32:40.695550897 -0700
+++ openjdk/jdk/make/sun/Makefile	2012-08-10 19:33:39.195550853 -0700
@@ -55,7 +55,7 @@ ifneq ($(PLATFORM), windows)
     endif
   endif
   HEADLESS_SUBDIR = headless

 #
 # Generated sun.nio.cs SingleByte classes
 #
@@ -973,12 +969,8 @@
 $(SFS_GEN)/UnixConstants.java: $(GENUC_EXE)
 	$(prep-target)
 	NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENUC_COPYRIGHT_YEARS)" > $@
