summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2006-10-15 16:38:09 +0000
committerBrian Paul <[email protected]>2006-10-15 16:38:09 +0000
commita20c0f293e23cf95befcabf316733de10f359b50 (patch)
tree836a7c1a9fd80c6ef1067a78865627704d963503
parent07fd19f572de30f872ab574528eb569e3c9e2ae5 (diff)
check if files exist before installing (Thierry Reding)
-rw-r--r--src/mesa/Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index d4645606f7f..e3a93921d70 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -141,7 +141,7 @@ $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECT
depend: $(ALL_SOURCES)
@ echo "running $(MKDEP)"
@ touch depend
- $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) \
+ @$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) \
> /dev/null
@@ -154,7 +154,12 @@ install: default
$(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)/$(GL_LIB_NAME)* $(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); \
+ fi
@if [ "${DRIVER_DIRS}" = "dri" ] ; then \
cd drivers/dri ; $(MAKE) install ; \
fi