Missed in last commit:

Build fixing for FreeBSD.  GNU make is installed as gmake, so make a MAKE
variable (defaults to "make") and use that.  Use the MKDEP and MKDEP_OPTIONS
more.  Our shell isn't bash, so change the instances of ">& /dev/null" to a more
compatible "> /dev/null 2>&1".

diff --git a/src/glut/mini/Makefile b/src/glut/mini/Makefile
index 5c0f5f7fb66784fb7c5f1db5a7373f5615dc1859..ebb28d18c23be40de49e0ece96bb78542de4a94a 100644 (file)
--- a/src/glut/mini/Makefile
+++ b/src/glut/mini/Makefile
@@ -65,7 +65,7 @@ $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
 # what's included by any source file.
 depend: $(SOURCES) 
        touch depend
-       makedepend -fdepend -Y $(INCLUDES) $(SOURCES) >& /dev/null
+       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 2>&1
 
 # Emacs tags
 tags:

diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile
index 3c1c54a64145a4181c1bc2b8e8efdd05567fa4f2..c030641feb66b2809a18a7f69e1758251449c43c 100644 (file)
--- a/src/glx/mini/Makefile
+++ b/src/glx/mini/Makefile
@@ -57,7 +57,8 @@ drmtest: xf86drm.o drmtest.o
 
 depend: $(C_SOURCES) $(ASM_SOURCES)
        touch depend
-       makedepend -fdepend -Y $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) >& /dev/null
+       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \
+               > /dev/null 2>&1
 
 
 # Emacs tags

diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index a0d3412a4180e89d89c6696fd8017f32dcebaf01..22b290395e211c0414c5bbfcfebaa8152844de90 100644 (file)
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -85,7 +85,7 @@ $(LIB_DIR)/$(LIBNAME):  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile ../Makefil
 depend: $(C_SOURCES) $(ASM_SOURCES)
        touch depend
        $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \
-               >& /dev/null
+               > /dev/null 2>&1
 
 
 # Emacs tags