Hi, I have attached two patches that fix two minor issues in the current build system. The first patch creates LIB_DIR and it's parent as needed and doesn't ignore errors. The second patch checks whether libGL or libOSMesa actually exist before trying to install them.
- Thierry
--- a/src/Makefile
+++ b/src/Makefile
@@ -29,7 +29,7 @@
done
$(TOP)/$(LIB_DIR):
- -mkdir $(TOP)/$(LIB_DIR)
+ mkdir -p $(TOP)/$(LIB_DIR)
clean:
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -154,7 +154,12 @@
$(INSTALL) -d $(INSTALL_DIR)/include/GL
$(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR)
$(INSTALL) -m 644 $(TOP)/include/GL/*.h $(INSTALL_DIR)/include/GL
- $(COPY_LIBS) $(TOP)/$(LIB_DIR)/libGL.* $(INSTALL_DIR)/$(LIB_DIR)
+ @if [ -e $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) ]; then \
+ $(COPY_LIBS) $(TOP)/$(LIB_DIR)/lib$(GL_LIB).*
$(INSTALL_DIR)/$(LIB_DIR); \
+ fi
+ @if [ -e $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) ]; then \
+ $(COPY_LIBS) $(TOP)/$(LIB_DIR)/lib$(OSMESA_LIB).*
$(INSTALL_DIR)/$(LIB_DIR); \
+ fi
@if [ "${DRIVER_DIRS}" = "dri" ] ; then \
cd drivers/dri ; $(MAKE) install ; \
fi
signature.asc
Description: Digital 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
