--- a/usr/src/lib/gd2/Makefile.sfw	Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/lib/gd2/Makefile.sfw	Mon Feb 08 15:41:40 2010 +0200
@@ -19,10 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)Makefile.sfw	1.5	09/02/08 SMI"
+# ident	"@(#)Makefile.sfw	1.6	10/01/22 SMI"
 
 #
 # This makefile builds both 32 and 64 bit versions of the library.
@@ -37,17 +37,13 @@
 
 # We need to do this because of missing freetype-config for 64-bit,
 # and because gd's libtool generator adds the wrong RPATH to LDFLAGS
-EXTRA_LDFLAGS32 = -Y P,/usr/openwin/lib:/usr/sfw/lib:/usr/lib -i
+EXTRA_LDFLAGS32 = -Y P,/usr/sfw/lib:/usr/lib -i
 EXTRA_LDFLAGS32 += -L/usr/sfw/lib
-EXTRA_LDFLAGS32 += -L/usr/openwin/lib
 EXTRA_LDFLAGS32 += -R/usr/sfw/lib
-EXTRA_LDFLAGS32 += -R/usr/openwin/lib
 
-EXTRA_LDFLAGS64 = -Y P,/usr/openwin/lib/$(MACH64):/usr/sfw/lib/$(MACH64):/usr/lib/$(MACH64) -i
+EXTRA_LDFLAGS64 = -Y P,/usr/sfw/lib/$(MACH64):/usr/lib/$(MACH64) -i
 EXTRA_LDFLAGS64 += -L/usr/sfw/lib/$(MACH64)
-EXTRA_LDFLAGS64 += -L/usr/openwin/lib/$(MACH64)
 EXTRA_LDFLAGS64 += -R/usr/sfw/lib/$(MACH64)
-EXTRA_LDFLAGS64 += -R/usr/openwin/lib/$(MACH64)
 
 include ../Makefile.lib
 
@@ -102,7 +98,7 @@
 	    --with-jpeg=$(PREFIX) \
 	    --with-fontconfig=$(PREFIX) \
 	    --with-freetype=$(PREFIX)/sfw \
-	    --with-xpm=$(PREFIX)/openwin \
+	    --with-xpm=$(PREFIX)/X11 \
 	    --with-x \
 	    --with-pic)
 
@@ -136,7 +132,7 @@
 	    --with-jpeg=$(PREFIX) \
 	    --with-fontconfig=$(PREFIX) \
 	    --with-freetype=$(PREFIX)/sfw \
-	    --with-xpm=$(PREFIX)/openwin \
+	    --with-xpm=$(PREFIX)/X11 \
 	    --with-x \
 	    --with-pic)