Use $(LIB_DIR) instead of $(TOP)/lib since libraries sometimes go into lib64/.

Probably need to fix the install destinations too...

src/glu/Makefile

@@ -15,7 +15,7 @@ default: $(TOP)/configs/current
 
 install:
 	$(INSTALL) -d $(INSTALL_DIR)/lib
-	$(COPY_LIBS) $(TOP)/lib/libGLU.* $(INSTALL_DIR)/lib
+	$(COPY_LIBS) $(LIB_DIR)/libGLU.* $(INSTALL_DIR)/lib
 
 clean:
 	@for dir in $(SUBDIRS) ; do \

src/glut/glx/Makefile

@@ -100,7 +100,7 @@ install:
 	$(INSTALL) -d $(INSTALL_DIR)/include/GL
 	$(INSTALL) -d $(INSTALL_DIR)/lib
 	$(INSTALL) -m 644 $(TOP)/include/GL/glut.h $(INSTALL_DIR)/include/GL
-	$(COPY_LIBS) $(TOP)/lib/libglut* $(INSTALL_DIR)/lib
+	$(COPY_LIBS) $(LIB_DIR)/libglut* $(INSTALL_DIR)/lib
 
 
 clean:

src/glw/Makefile

@@ -29,7 +29,7 @@ install:
 	$(INSTALL) -d $(INSTALL_DIR)/include/GL
 	$(INSTALL) -d $(INSTALL_DIR)/lib
 	$(INSTALL) -m 644 *.h $(INSTALL_DIR)/include/GL
-	$(COPY_LIBS) $(TOP)/lib/libGLw.* $(INSTALL_DIR)/lib
+	$(COPY_LIBS) $(LIB_DIR)/libGLw.* $(INSTALL_DIR)/lib
 
 clean:
 	-rm depend depend.bak

src/mesa/Makefile

@@ -152,7 +152,7 @@ install: default
 	$(INSTALL) -d $(INSTALL_DIR)/include/GL
 	$(INSTALL) -d $(INSTALL_DIR)/lib
 	$(INSTALL) -m 644 $(TOP)/include/GL/*.h $(INSTALL_DIR)/include/GL
-	$(COPY_LIBS) $(TOP)/lib/libGL.* $(INSTALL_DIR)/lib
+	$(COPY_LIBS) $(LIB_DIR)/libGL.* $(INSTALL_DIR)/lib
 	@if [ "${DRIVER_DIRS}" = "dri" ] ; then \
 		cd drivers/dri ; $(MAKE) install ; \
 	fi

src/mesa/drivers/directfb/Makefile

@@ -34,7 +34,7 @@ default: directfbgl_mesa
 # Mesa DirectFBGL module
 directfbgl_mesa: $(DIRECTFBGL_MESA_OBJECTS)
 	$(CC) -shared $(CFLAGS) $(DIRECTFBGL_MESA_OBJECTS) -o $(DIRECTFBGL_MESA) \
-	-Wl,-soname -Wl,$(DIRECTFBGL_MESA) -L$(TOP)/lib -lGL -lm
+	-Wl,-soname -Wl,$(DIRECTFBGL_MESA) -L$(LIB_DIR) -lGL -lm
 
 
 install:

src/mesa/drivers/dri/Makefile.template

@@ -76,7 +76,7 @@ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/driver
 
 
 $(LIB_DIR)/$(LIBNAME): $(LIBNAME)
-	install $(LIBNAME) $(LIB_DIR) 
+	$(INSTALL) $(LIBNAME) $(LIB_DIR)