summaryrefslogtreecommitdiffstats
path: root/src/glu/mesa/Makefile
diff options
context:
space:
mode:
authorKeith Packard <[email protected]>2008-06-03 22:56:25 -0700
committerKeith Packard <[email protected]>2008-06-03 22:56:25 -0700
commitdbf3c5247c90bd35c0b2002e3b972a2dd4c8b130 (patch)
treedd986e993f20f78999fc15c304289656878ffcae /src/glu/mesa/Makefile
parent4b5b008d54e86ac4f0a2176429d062100978ca8c (diff)
parent0b734bd7cf921592eee441f759687e10f48a2cbc (diff)
Merge commit 'origin/master' into drm-gem
Conflicts: src/mesa/drivers/dri/common/dri_bufmgr.h src/mesa/drivers/dri/intel/intel_bufmgr_ttm.c src/mesa/drivers/dri/intel/intel_bufmgr_ttm.h src/mesa/drivers/dri/intel/intel_ioctl.c
Diffstat (limited to 'src/glu/mesa/Makefile')
-rw-r--r--src/glu/mesa/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glu/mesa/Makefile b/src/glu/mesa/Makefile
index fb377555bea..1064bbd2d4f 100644
--- 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):