Hi, To make correct installation on 64 bit machines possible, I've introduced a new var INSTALL_LIB_DIR and set it to $(INSTALL_DIR)/lib64 on amd64 (should probably be done on other archs, too).
Attached patch, please apply. -- Hanno Böck Blog: http://www.hboeck.de/ GPG: 3DBD3B20 Jabber: [EMAIL PROTECTED]
diff -Naur Mesa-orig/configs/default Mesa/configs/default
--- Mesa-orig/configs/default 2006-07-12 19:23:47.343588304 +0200
+++ Mesa/configs/default 2006-07-12 20:47:23.841099804 +0200
@@ -81,3 +81,4 @@
# Installation directories (for make install)
INSTALL_DIR = /usr/local
DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri
+INSTALL_LIB_DIR = $(INSTALL_DIR)/lib
diff -Naur Mesa-orig/configs/linux-dri-x86-64 Mesa/configs/linux-dri-x86-64
--- Mesa-orig/configs/linux-dri-x86-64 2006-07-12 19:23:47.567602304 +0200
+++ Mesa/configs/linux-dri-x86-64 2006-07-12 20:46:50.202997554 +0200
@@ -22,3 +22,4 @@
#
DRI_DIRS = i915 mach64 mga r128 r200 radeon tdfx unichrome savage r300
+INSTALL_LIB_DIR = $(INSTALL_DIR)/lib64
diff -Naur Mesa-orig/configs/linux-x86-64 Mesa/configs/linux-x86-64
--- Mesa-orig/configs/linux-x86-64 2006-07-12 19:23:49.459720554 +0200
+++ Mesa/configs/linux-x86-64 2006-07-12 20:47:15.696590804 +0200
@@ -12,3 +12,5 @@
LIB_DIR = $(TOP)/lib64
EXTRA_LIB_PATH = -L/usr/X11R6/lib64
+
+INSTALL_LIB_DIR = $(INSTALL_DIR)/lib64
diff -Naur Mesa-orig/src/glu/Makefile Mesa/src/glu/Makefile
--- Mesa-orig/src/glu/Makefile 2006-07-12 19:24:26.570039804 +0200
+++ Mesa/src/glu/Makefile 2006-07-12 20:44:50.471514804 +0200
@@ -14,8 +14,8 @@
done
install:
- $(INSTALL) -d $(INSTALL_DIR)/lib
- $(COPY_LIBS) $(LIB_DIR)/libGLU.* $(INSTALL_DIR)/lib
+ $(INSTALL) -d $(INSTALL_LIB_DIR)
+ $(COPY_LIBS) $(LIB_DIR)/libGLU.* $(INSTALL_LIB_DIR)
clean:
@for dir in $(SUBDIRS) ; do \
diff -Naur Mesa-orig/src/glut/glx/Makefile Mesa/src/glut/glx/Makefile
--- Mesa-orig/src/glut/glx/Makefile 2006-07-12 19:24:28.338150304 +0200
+++ Mesa/src/glut/glx/Makefile 2006-07-12 20:45:07.536581304 +0200
@@ -98,9 +98,9 @@
install:
$(INSTALL) -d $(INSTALL_DIR)/include/GL
- $(INSTALL) -d $(INSTALL_DIR)/lib
+ $(INSTALL) -d $(INSTALL_LIB_DIR)
$(INSTALL) -m 644 $(TOP)/include/GL/glut.h $(INSTALL_DIR)/include/GL
- $(COPY_LIBS) $(LIB_DIR)/libglut* $(INSTALL_DIR)/lib
+ $(COPY_LIBS) $(LIB_DIR)/libglut* $(INSTALL_LIB_DIR)
clean:
diff -Naur Mesa-orig/src/glw/Makefile Mesa/src/glw/Makefile
--- Mesa-orig/src/glw/Makefile 2006-07-12 19:24:29.042194304 +0200
+++ Mesa/src/glw/Makefile 2006-07-12 20:44:14.689278554 +0200
@@ -27,9 +27,9 @@
install:
$(INSTALL) -d $(INSTALL_DIR)/include/GL
- $(INSTALL) -d $(INSTALL_DIR)/lib
+ $(INSTALL) -d $(INSTALL_LIB_DIR)
$(INSTALL) -m 644 *.h $(INSTALL_DIR)/include/GL
- $(COPY_LIBS) $(LIB_DIR)/libGLw.* $(INSTALL_DIR)/lib
+ $(COPY_LIBS) $(LIB_DIR)/libGLw.* $(INSTALL_LIB_DIR)
clean:
-rm depend depend.bak
diff -Naur Mesa-orig/src/mesa/Makefile Mesa/src/mesa/Makefile
--- Mesa-orig/src/mesa/Makefile 2006-07-12 19:24:29.246207054 +0200
+++ Mesa/src/mesa/Makefile 2006-07-12 19:26:28.261645054 +0200
@@ -150,9 +150,9 @@
install: default
$(INSTALL) -d $(INSTALL_DIR)/include/GL
- $(INSTALL) -d $(INSTALL_DIR)/lib
+ $(INSTALL) -d $(INSTALL_LIB_DIR)
$(INSTALL) -m 644 $(TOP)/include/GL/*.h $(INSTALL_DIR)/include/GL
- $(COPY_LIBS) $(LIB_DIR)/libGL.* $(INSTALL_DIR)/lib
+ $(COPY_LIBS) $(LIB_DIR)/libGL.* $(INSTALL_LIB_DIR)
@if [ "${DRIVER_DIRS}" = "dri" ] ; then \
cd drivers/dri ; $(MAKE) install ; \
fi
pgpZP6HZHC2Ji.pgp
Description: PGP signature
------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________ Mesa3d-dev mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
