--- a/open-src/driver/xf86-video-ati/Makefile	Fri Mar 25 16:48:10 2011 -0700
+++ b/open-src/driver/xf86-video-ati/Makefile	Fri Mar 25 17:37:55 2011 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-video-ati Makefile
 #
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -62,25 +62,18 @@
 # Paths to find libraries/modules to link with - libraries themselves listed
 # in src/Makefile.am since ATI has multiple submodules with different needs
 MODULE_LD_OPTIONS= \
-	-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-	-L$(PROTODIR)$(MESA_XSERVERMODS_DIR)/extensions$(SERVERMOD_subdir) \
-	-L$(PROTODIR)$(X11_SERVERMODS_DIR)/extensions$(SERVERMOD_subdir) \
+	-L$(PROTODIR)$(X11_SERVERMODS_DIR) \
+	-L$(PROTODIR)$(MESA_XSERVERMODS_DIR)/extensions \
+	-L$(PROTODIR)$(X11_SERVERMODS_DIR)/extensions \
 	-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
 	-M $(PWD)/mapfile-bt829_drv-external \
 	-M $(PWD)/mapfile-fi1236_drv-external \
 	-M $(PWD)/mapfile-msp3430_drv-external \
 	-M $(PWD)/mapfile-tda9885_drv-external \
 	-M $(PWD)/mapfile-uda1380_drv-external \
-	-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-	-R$(MESA_XSERVERMODS_DIR)/extensions$(SERVERMOD_subdir) \
-	-R$(X11_SERVERMODS_DIR)/extensions$(SERVERMOD_subdir) \
+	-R$(X11_SERVERMODS_DIR) \
+	-R$(MESA_XSERVERMODS_DIR)/extensions \
+	-R$(X11_SERVERMODS_DIR)/extensions \
 	-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)
 
-# Need to override install path for all the modules, not just ati_drv.so
-MULTIMEDIA_MODDIR = $(X11_SERVERMODS_DIR)/multimedia$(SERVERMOD_subdir)
-MODULE_MAKEFLAGS = radeon_drv_ladir='$(DRIVER_DIR)' \
-	theatre_detect_drv_ladir='$(MULTIMEDIA_MODDIR)' \
-	theatre_drv_ladir='$(MULTIMEDIA_MODDIR)' \
-	theatre200_drv_ladir='$(MULTIMEDIA_MODDIR)'
-
 include ../Makefile.inc