Merge commit 'origin/master' into gallium-0.2

[mesa.git] / src / glu / mesa / Makefile

diff --git a/src/glu/mesa/Makefile b/src/glu/mesa/Makefile
index fb377555bea224c109e9254c74dd274e1fd4250e..c468ce6210022b45516c4ac97f775ed5eb7a0cf5 100644 (file)
--- a/src/glu/mesa/Makefile
+++ b/src/glu/mesa/Makefile
@@ -37,7 +37,7 @@ default:
                echo "$(GLU_LIB_NAME) not build under BeOS, but integrated into ${GL_LIB_NAME}." ; \
                exit 0 ; \
        else \
-               $(MAKE) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) ; \
+               $(MAKE) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) || exit 1 ; \
        fi
 
 $(TOP)/$(LIB_DIR):
@@ -45,7 +45,7 @@ $(TOP)/$(LIB_DIR):
 
 # Make the library:
 $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
-       @ $(TOP)/bin/mklib -o $(GLU_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+       @ $(MKLIB) -o $(GLU_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
                -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
                $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
                $(GLU_LIB_DEPS) $(OBJECTS)