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

Probably need to fix the install destinations too...

diff --git a/src/glu/Makefile b/src/glu/Makefile
index 4e02e86da6350d15800cb6605b515bd350a548fd..a7b8e2b7245ec0d6e1c6d7fcec3f9353e898b198 100644 (file)
--- 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 49c775fb2220b0c27524f7ec17a76eb06d761a78..534d7a7ad5b0d0ea52cb2aabd9f1629817b01602 100644 (file)
--- 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 af25f7dcbc3e8e9a67932fe5e1e9670cdc703075..dbe64c9566d3a1b1ca2882bc544fc0a28fc27a5b 100644 (file)
--- 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 5f171f4757192c9c4e97f8392e60a9a0aaa300f8..652cb449070b0a66046f18f6cc4edbc9808dfc82 100644 (file)
--- 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 56f7eac7caee4a08d466f525b29e35c28bb4f42b..2184b1e3ccd1a520e169b04cb2523ed293c84ef7 100644 (file)
--- 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 9d08c44d65316bfe0051b0d139a09470483cf98c..e802dd545ec56bc59cb0091d10047c64b73dd0a6 100644 (file)
--- 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)