From 57a9560def25dda85d678eea913bf16d7fd7f1a7 Mon Sep 17 00:00:00 2001
From: Michael McMahon <michaelm@openjdk.org>
Date: Thu, 8 Mar 2012 14:38:26 +0000
Subject: [PATCH] 7152186: java.awt.HeadlessException when running AWT apps
 [macosx]

Reviewed-by: anthony
---
 jdk/make/com/apple/osxui/Makefile                | 2 +-
 jdk/make/sun/headless/Makefile                   | 5 -----
 jdk/make/sun/jawt/Makefile                       | 2 +-
 jdk/make/sun/lwawt/Makefile                      | 4 ++--
 jdk/make/sun/xawt/Makefile                       | 4 ----
 jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c | 7 ++++---
 6 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/jdk/make/com/apple/osxui/Makefile b/jdk/make/com/apple/osxui/Makefile
index ec3be99cbba..63d78d2872e 100644
--- a/jdk/make/com/apple/osxui/Makefile
+++ b/jdk/make/com/apple/osxui/Makefile
@@ -98,7 +98,7 @@ CPPFLAGS += \
 
 OTHER_LDLIBS = \
     -lawt -losxapp \
-    -llwawt -L$(LIBDIR)/lwawt -Xlinker -rpath -Xlinker @loader_path/lwawt \
+    -lawt_lwawt -L$(LIBDIR) -Xlinker -rpath -Xlinker @loader_path \
     -framework Cocoa \
     -framework Carbon \
     -framework ApplicationServices \
diff --git a/jdk/make/sun/headless/Makefile b/jdk/make/sun/headless/Makefile
index 3d6c7a16e92..2b3aae4fd76 100644
--- a/jdk/make/sun/headless/Makefile
+++ b/jdk/make/sun/headless/Makefile
@@ -29,11 +29,6 @@ NO_ROBOT = true
 MOTIF_VERSION = none
 MOTIF_VERSION_STRING=none
 
-ifeq ($(PLATFORM), macosx)
-LIB_LOCATION = $(LIBDIR)/headless
-else
-endif
-
 PACKAGE = sun.awt
 LIBRARY = awt_headless
 PRODUCT = sun
diff --git a/jdk/make/sun/jawt/Makefile b/jdk/make/sun/jawt/Makefile
index d3fc66ed8e7..28cb54ea083 100644
--- a/jdk/make/sun/jawt/Makefile
+++ b/jdk/make/sun/jawt/Makefile
@@ -133,7 +133,7 @@ endif # PLATFORM
 
 ifeq ($(PLATFORM), macosx)
 vpath %.m   $(call NativeSrcDirList,,native/sun/awt)
-OTHER_LDLIBS = -llwawt -L$(LIBDIR)/lwawt -Xlinker -rpath -Xlinker @loader_path/lwawt \
+OTHER_LDLIBS = -lawt_lwawt -L$(LIBDIR) -Xlinker -rpath -Xlinker @loader_path \
                -framework Cocoa
 endif # PLATFORM
 
diff --git a/jdk/make/sun/lwawt/Makefile b/jdk/make/sun/lwawt/Makefile
index 27dd09859b0..6c0742fdfef 100644
--- a/jdk/make/sun/lwawt/Makefile
+++ b/jdk/make/sun/lwawt/Makefile
@@ -26,10 +26,10 @@
 BUILDDIR = ../..
 MODULE  = awt
 PACKAGE = sun.lwawt
-LIBRARY = lwawt
+LIBRARY = awt_lwawt
 PRODUCT = sun
 
-LIB_LOCATION = $(LIBDIR)/lwawt
+LIB_LOCATION = $(LIBDIR)
 
 include $(BUILDDIR)/common/Defs.gmk
 
diff --git a/jdk/make/sun/xawt/Makefile b/jdk/make/sun/xawt/Makefile
index 4b88f1eeabe..f8918ead3fa 100644
--- a/jdk/make/sun/xawt/Makefile
+++ b/jdk/make/sun/xawt/Makefile
@@ -28,10 +28,6 @@ PACKAGE = sun.awt.X11
 LIBRARY = awt_xawt
 PRODUCT = sun
 
-ifeq ($(PLATFORM), macosx)
-LIB_LOCATION = $(LIBDIR)/xawt
-endif
-
 include $(BUILDDIR)/common/Defs.gmk
 
 GEN_DIR=$(GENSRCDIR)/sun/awt/X11
diff --git a/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c b/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c
index 05357d59ff3..cdb0e8f9d08 100644
--- a/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c
+++ b/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c
@@ -77,11 +77,12 @@ JNIEXPORT jboolean JNICALL AWTIsHeadless() {
  * Pathnames to the various awt toolkits
  */
 
+
 #ifdef MACOSX
-  #define XAWT_PATH "/xawt/libawt_xawt.dylib"
-  #define LWAWT_PATH "/lwawt/liblwawt.dylib"
+  #define XAWT_PATH "/libawt_xawt.dylib"
+  #define LWAWT_PATH "/libawt_lwawt.dylib"
   #define DEFAULT_PATH LWAWT_PATH
-  #define HEADLESS_PATH "/headless/libawt_headless.dylib"
+  #define HEADLESS_PATH "/libawt_headless.dylib"
 #else
   #define XAWT_PATH "/libawt_xawt.so"
   #define DEFAULT_PATH XAWT_PATH