summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-10-18 22:05:13 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-10-18 22:05:13 +0000
commitfee08575cdb2d10c3692eaafb81c5dab15b854e5 (patch)
tree37ccc13847ce638f0f11997e6589824f8d178b1a
parent3beaff1e3cf227c493badfc55a69381c778b2ff7 (diff)
Changed install filenames to libGL* and libOSMesa* so things work on Darwin
where GL_LIB_NAME = libGL.dylib but the other library name is libGL.1.dylib Unlike other platforms, the version number is in the middle of the name, not at the end. See bug 8671
-rw-r--r--src/mesa/Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index e3a93921d7..e1046bb8ad 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -155,18 +155,18 @@ install: default
$(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR)
$(INSTALL) -m 644 $(TOP)/include/GL/*.h $(INSTALL_DIR)/include/GL
@if [ -e $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) ]; then \
- $(COPY_LIBS) $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)* $(INSTALL_DIR)/$(LIB_DIR); \
+ $(COPY_LIBS) $(TOP)/$(LIB_DIR)/libGL* $(INSTALL_DIR)/$(LIB_DIR); \
fi
@if [ -e $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) ]; then \
- $(COPY_LIBS) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)* $(INSTALL_DIR)/$(LIB_DIR); \
+ $(COPY_LIBS) $(TOP)/$(LIB_DIR)/libOSMesa* $(INSTALL_DIR)/$(LIB_DIR); \
fi
@if [ "${DRIVER_DIRS}" = "dri" ] ; then \
cd drivers/dri ; $(MAKE) install ; \
fi
- ## NOT YET:
- ## $(INSTALL) -d $(INSTALL_DIR)/include/GLES
- ## $(INSTALL) -m 644 include/GLES/*.h $(INSTALL_DIR)/include/GLES
+## NOT INSTALLED YET:
+## $(INSTALL) -d $(INSTALL_DIR)/include/GLES
+## $(INSTALL) -m 644 include/GLES/*.h $(INSTALL_DIR)/include/GLES
# Emacs tags