4 files changed, 8 insertions, 24 deletions
diff --git a/src/Makefile b/src/Makefile
index 7f8dfd09cd..8003c5a95c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,9 +13,7 @@ default: $(LIB_DIR) subdirs
 subdirs:
 	@for dir in $(SUBDIRS) ; do \
 		if [ -d $$dir ] ; then \
-			pushd $$dir ; \
-			make ; \
-			popd ; \
+			(cd $$dir ; make) ; \
 		fi \
 	done
 
@@ -27,8 +25,6 @@ $(LIB_DIR):
 clean:
 	@for dir in $(SUBDIRS) ; do \
 		if [ -d $$dir ] ; then \
-			pushd $$dir ; \
-			make clean ; \
-			popd ; \
+			(cd $$dir ; make clean) ; \
 		fi \
 	done
diff --git a/src/glu/Makefile b/src/glu/Makefile
index 4ddf09016b..2b922fc021 100644
--- a/src/glu/Makefile
+++ b/src/glu/Makefile
@@ -10,15 +10,11 @@ SUBDIRS = $(GLU_DIRS)
 
 default: $(TOP)/configs/current
 	@for dir in $(SUBDIRS) ; do \
-		pushd $$dir ; \
-		make ; \
-		popd ; \
+		(cd $$dir ; make) ; \
 	done
 
 
 clean:
 	@for dir in $(SUBDIRS) ; do \
-		pushd $$dir ; \
-		make clean; \
-		popd ; \
+		(cd $$dir ; make clean) ; \
 	done
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index a90ac8275a..114388ff5b 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -97,9 +97,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:
-	@pushd x86 ; \
-	make ; \
-	popd
+	(cd x86 ; make)
 
 # Make the GL library
 $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
@@ -167,9 +165,7 @@ clean:
 	-rm -f */*.o
 	rm -f depend
 	for dir in $(SUBDIRS) ; do \
-		pushd $$dir ; \
-		make clean ; \
-		popd ; \
+		(cd $$dir ; make clean) ; \
 	done
 
 include depend
diff --git a/src/mesa/drivers/dri/Makefile b/src/mesa/drivers/dri/Makefile
index 5a961e96af..2967106ea5 100644
--- a/src/mesa/drivers/dri/Makefile
+++ b/src/mesa/drivers/dri/Makefile
@@ -17,15 +17,11 @@ $(LIB_DIR):
 
 subdirs:
 	@for dir in $(SUBDIRS) ; do \
-		pushd $$dir ; \
-		make ; \
-		popd ; \
+		(cd $$dir ; make) ; \
 	done
 
 
 clean:
 	@for dir in $(SUBDIRS) ; do \
-		pushd $$dir ; \
-		make clean ; \
-		popd ; \
+		(cd $$dir ; make clean) ; \
 	done