From 78a6000cf2eb294181ea1af049fae6d4f6167bcb Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 26 Jun 2006 15:34:21 +0000
Subject: Use $(LIB_DIR) instead of $(TOP)/lib since libraries sometimes go
 into lib64/. Probably need to fix the install destinations too...

---
 src/glu/Makefile                       | 2 +-
 src/glut/glx/Makefile                  | 2 +-
 src/glw/Makefile                       | 2 +-
 src/mesa/Makefile                      | 2 +-
 src/mesa/drivers/directfb/Makefile     | 2 +-
 src/mesa/drivers/dri/Makefile.template | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/glu/Makefile b/src/glu/Makefile
index 4e02e86da6..a7b8e2b724 100644
--- a/src/glu/Makefile
+++ b/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 \
diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile
index 49c775fb22..534d7a7ad5 100644
--- a/src/glut/glx/Makefile
+++ b/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:
diff --git a/src/glw/Makefile b/src/glw/Makefile
index af25f7dcbc..dbe64c9566 100644
--- a/src/glw/Makefile
+++ b/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
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 5f171f4757..652cb44907 100644
--- a/src/mesa/Makefile
+++ b/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
diff --git a/src/mesa/drivers/directfb/Makefile b/src/mesa/drivers/directfb/Makefile
index 56f7eac7ca..2184b1e3cc 100644
--- a/src/mesa/drivers/directfb/Makefile
+++ b/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:
diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index 9d08c44d65..e802dd545e 100644
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/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) 
 
 
 
-- 
cgit v1.2.3