--- a/open-src/xserver/Makefile.inc	Fri Jun 18 11:23:34 2010 -0700
+++ b/open-src/xserver/Makefile.inc	Mon Jun 21 10:51:30 2010 -0700
@@ -81,10 +81,6 @@
 	$(DPMS_DEFINES) -DSUNSOFT -DTSOL \
 	$(MODTYPE_CPPFLAGS_$(MODULE_COMPILER))
 
-XSERVER_LDFLAGS_suncc= # No extra flags needed
-XSERVER_LDFLAGS_gcc= -L/usr/sfw/lib$(ARCHLIBSUBDIR) \
-		     -R/usr/sfw/lib$(ARCHLIBSUBDIR)
-
 # Environment variable options to GNU autoconf configure script
 #  - XSERVERCFLAGS_CFLAGS - force CFLAGS to avoid -I /usr/X11/include breaking
 #    use of headers from proto area
@@ -100,11 +96,13 @@
 
 MODTYPE_CFLAGS=$(PROG_CFLAGS)
 MODTYPE_CXXFLAGS=$(PROG_CXXFLAGS)
-MODTYPE_LDFLAGS=$(PROG_LDFLAGS) $(XSERVER_LDFLAGS_$(MODULE_COMPILER)) \
+MODTYPE_LDFLAGS=$(PROG_LDFLAGS)
+
+XSERVER_LDFLAGS = \
 	-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
 	-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
 	-L$(PROTODIR)$(X11_DIR)/lib$(ARCHLIBSUBDIR) \
-	-R$(X11_DIR)/lib$(ARCHLIBSUBDIR)
+	-R$(X11_LIB_DIR)$(ARCHLIBSUBDIR)
 
 MODTYPE_BUILD_32_FLAGS=ARCHBINSUBDIR="$(SUBDIR32)"