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".

14 files changed, 30 insertions, 27 deletions

diff --git a/Makefile b/Makefile
index 64f86275514..e5d5aca8fd5 100644
--- a/Makefile
+++ b/Makefile
@@ -7,19 +7,19 @@ SUBDIRS = src progs
 
 default: $(TOP)/configs/current
 	@for dir in $(SUBDIRS) ; do \
-		(cd $$dir ; make) || exit 1 ; \
+		(cd $$dir ; $(MAKE)) || exit 1 ; \
 	done
 
 
 clean:
 	@for dir in $(SUBDIRS) ; do \
-		(cd $$dir ; make clean) ; \
+		(cd $$dir ; $(MAKE) clean) ; \
 	done
 
 
 realclean:
 	touch $(TOP)/configs/current
-	make clean
+	$(MAKE) clean
 	-rm -rf lib*
 	-rm -f $(TOP)/configs/current
 
@@ -101,7 +101,7 @@ sunos5-gcc \
 sunos5-smp \
 ultrix-gcc:
 	(cd configs && rm -f current && ln -s $@ current)
-	make default
+	$(MAKE) default
 
 
 # Rules for making release tarballs
diff --git a/configs/default b/configs/default
index 8c005bf48b8..f955e3d3b78 100644
--- a/configs/default
+++ b/configs/default
@@ -24,7 +24,7 @@ GLU_CFLAGS =
 MKLIB_OPTIONS = 
 MKDEP = makedepend
 MKDEP_OPTIONS = -Y -fdepend
-
+MAKE = make
 
 # Library names (base name)
 GL_LIB = GL
diff --git a/configs/freebsd b/configs/freebsd
index 85f14f7ed5f..a7d8c615e90 100644
--- a/configs/freebsd
+++ b/configs/freebsd
@@ -7,6 +7,7 @@ CONFIG_NAME = FreeBSD
 # Compiler and flags
 CC = gcc
 CXX = g++
+MAKE = gmake
 
 CFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DUSE_XSHM -DHZ=100
 CXXFLAGS = -O2 -fPIC -pedantic
diff --git a/progs/Makefile b/progs/Makefile
index c44c9d73e4a..d6b0477a43a 100644
--- a/progs/Makefile
+++ b/progs/Makefile
@@ -10,7 +10,7 @@ SUBDIRS = $(PROGRAM_DIRS)
 default: $(TOP)/configs/current
 	@for dir in $(SUBDIRS) ; do \
 		if [ -d $$dir ] ; then \
-			(cd $$dir ; make) || exit 1 ; \
+			(cd $$dir ; $(MAKE)) || exit 1 ; \
 		fi \
 	done
 
@@ -18,6 +18,6 @@ default: $(TOP)/configs/current
 clean:
 	@for dir in $(SUBDIRS) tests ; do \
 		if [ -d $$dir ] ; then \
-			(cd $$dir ; make clean) ; \
+			(cd $$dir ; $(MAKE) clean) ; \
 		fi \
 	done
diff --git a/progs/miniglx/Makefile b/progs/miniglx/Makefile
index 6e6b0a85486..825d50a47c3 100644
--- a/progs/miniglx/Makefile
+++ b/progs/miniglx/Makefile
@@ -47,7 +47,7 @@ clean:
 
 depend: $(SOURCES)
 	touch depend
-	makedepend -fdepend -Y $(INCLUDES) $(SOURCES) >& /dev/null
+	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 2>&1
 
 
 # Emacs tags
diff --git a/src/Makefile b/src/Makefile
index 8e9b8b96684..ffcddffec5f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,7 +13,7 @@ default: $(LIB_DIR) subdirs
 subdirs:
 	@for dir in $(SUBDIRS) ; do \
 		if [ -d $$dir ] ; then \
-			(cd $$dir ; make) || exit 1 ; \
+			(cd $$dir ; $(MAKE)) || exit 1 ; \
 		fi \
 	done
 
@@ -25,6 +25,6 @@ $(LIB_DIR):
 clean:
 	@for dir in $(SUBDIRS) ; do \
 		if [ -d $$dir ] ; then \
-			(cd $$dir ; make clean) ; \
+			(cd $$dir ; $(MAKE) clean) ; \
 		fi \
 	done
diff --git a/src/glu/Makefile b/src/glu/Makefile
index 2b922fc021d..915b95081a9 100644
--- a/src/glu/Makefile
+++ b/src/glu/Makefile
@@ -10,11 +10,11 @@ SUBDIRS = $(GLU_DIRS)
 
 default: $(TOP)/configs/current
 	@for dir in $(SUBDIRS) ; do \
-		(cd $$dir ; make) ; \
+		(cd $$dir ; $(MAKE)) ; \
 	done
 
 
 clean:
 	@for dir in $(SUBDIRS) ; do \
-		(cd $$dir ; make clean) ; \
+		(cd $$dir ; $(MAKE) clean) ; \
 	done
diff --git a/src/glw/Makefile b/src/glw/Makefile
index 635f862b9e9..3af07a1491c 100644
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -44,7 +44,8 @@ $(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
 # 
 depend: $(GLW_SOURCES)
 	touch depend
-	$(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(GLW_SOURCES) >&/dev/null
+	$(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(GLW_SOURCES) \
+		> /dev/null 2>&1
 
 
 include depend
diff --git a/src/glx/Makefile b/src/glx/Makefile
index d6bef1054aa..bd486cf81b3 100644
--- a/src/glx/Makefile
+++ b/src/glx/Makefile
@@ -4,9 +4,9 @@ include $(TOP)/configs/current
 
 
 default:
-	cd mini ; make
+	cd mini ; $(MAKE)
 
 
 clean:
-	cd mini ; make clean
+	cd mini ; $(MAKE) clean
 
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 31f64c5f272..ea844afae7a 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -21,11 +21,11 @@ GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 # Figure out what to make here
 default:
 	@if [ "${DRIVER_DIRS}" = "dri" ] ; then \
-		make linux-solo ; \
+		$(MAKE) linux-solo ; \
 	elif [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
-		make osmesa-only ; \
+		$(MAKE) osmesa-only ; \
 	else \
-		make stand-alone ; \
+		$(MAKE) stand-alone ; \
 	fi
 
 
@@ -58,7 +58,7 @@ mesa.a:	$(SOLO_OBJECTS)
 # target, otherwise make will look & see that the "drivers" directory
 # already exists, so not try to rebuild it...
 driver-dirs:
-	cd drivers/dri ; make
+	cd drivers/dri ; $(MAKE)
 
 
 ######################################################################
@@ -101,7 +101,7 @@ stand-alone: depend subdirs $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(OSMESA_LIB_NA
 osmesa-only: depend subdirs $(LIB_DIR)/$(OSMESA_LIB_NAME)
 
 subdirs:
-	@ (cd x86 ; make)
+	@ (cd x86 ; $(MAKE))
 
 # Make the GL library
 $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
@@ -159,7 +159,8 @@ SUBDIRS = array_cache drivers/dri glapi main math sparc swrast swrast_setup \
 # Update dependencies
 depend: $(ALL_SOURCES)
 	touch depend
-	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(ALL_SOURCES) >& /dev/null
+	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(ALL_SOURCES) \
+		> /dev/null 2>&1
 
 
 # Emacs tags
@@ -170,7 +171,7 @@ clean:
 	-rm -f */*.o
 	rm -f depend mesa.a
 	for dir in $(SUBDIRS) ; do \
-		(cd $$dir ; make clean) ; \
+		(cd $$dir ; $(MAKE) clean) ; \
 	done
 
 include depend
diff --git a/src/mesa/drivers/dri/Makefile b/src/mesa/drivers/dri/Makefile
index c1af50696ce..c4d9a837767 100644
--- a/src/mesa/drivers/dri/Makefile
+++ b/src/mesa/drivers/dri/Makefile
@@ -17,12 +17,12 @@ subdirs:
 	echo $(DRI_DIRS)
 	@for dir in $(DRI_DIRS) ; do \
 		echo $$dir ; \
-		(cd $$dir ; make) || exit 1; \
+		(cd $$dir ; $(MAKE)) || exit 1; \
 	done
 
 
 clean:
 	@for dir in $(DRI_DIRS) ; do \
-		(cd $$dir ; make clean) ; \
+		(cd $$dir ; $(MAKE) clean) ; \
 	done
 	rm common/*.o
diff --git a/src/mesa/drivers/dri/dri_client/Makefile b/src/mesa/drivers/dri/dri_client/Makefile
index 4f90cbfd461..ae4bf3055b6 100644
--- a/src/mesa/drivers/dri/dri_client/Makefile
+++ b/src/mesa/drivers/dri/dri_client/Makefile
@@ -43,7 +43,7 @@ default: depend dri.a
 depend: $(C_SOURCES) $(ASM_SOURCES)
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) -Y $(INCLUDES) \
-		$(C_SOURCES) $(ASM_SOURCES) >& /dev/null
+		$(C_SOURCES) $(ASM_SOURCES) > /dev/null 2>&1
 
 
 dri.a:	$(OBJECTS)
diff --git a/src/mesa/drivers/dri/fb/Makefile b/src/mesa/drivers/dri/fb/Makefile
index a50aa0cb455..578eeb94400 100644
--- a/src/mesa/drivers/dri/fb/Makefile
+++ b/src/mesa/drivers/dri/fb/Makefile
@@ -64,7 +64,7 @@ $(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile
 depend: $(C_SOURCES) $(ASM_SOURCES)
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(C_SOURCES) $(ASM_SOURCES) \
-		>& /dev/null
+		> /dev/null 2>&1
 
 
 # Emacs tags
diff --git a/src/mesa/drivers/dri/x11/Makefile b/src/mesa/drivers/dri/x11/Makefile
index 9804411030f..a0334b17a3c 100644
--- a/src/mesa/drivers/dri/x11/Makefile
+++ b/src/mesa/drivers/dri/x11/Makefile
@@ -74,7 +74,7 @@ $(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile
 depend: $(C_SOURCES) $(ASM_SOURCES)
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(C_SOURCES) $(ASM_SOURCES) \
-		>& /dev/null
+		> /dev/null 2>&1
 
 
 # Emacs tags