From df8bc572587f04b29055bb3a36f8c3b724c63b96 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 26 Mar 2004 21:38:45 +0000
Subject: [PATCH] Don't use pushd/popd.

---
 Makefile                      | 8 ++------
 progs/Makefile                | 8 ++------
 src/Makefile                  | 8 ++------
 src/glu/Makefile              | 8 ++------
 src/mesa/Makefile             | 8 ++------
 src/mesa/drivers/dri/Makefile | 8 ++------
 6 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/Makefile b/Makefile
index 853bc3c6eee..5c954e574da 100644
--- a/Makefile
+++ b/Makefile
@@ -7,17 +7,13 @@ SUBDIRS = src progs
 
 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/progs/Makefile b/progs/Makefile
index f925de5860b..6870630eb51 100644
--- a/progs/Makefile
+++ b/progs/Makefile
@@ -10,9 +10,7 @@ SUBDIRS = $(PROGRAM_DIRS)
 default: $(TOP)/configs/current
 	@for dir in $(SUBDIRS) ; do \
 		if [ -d $$dir ] ; then \
-			pushd $$dir ; \
-			make ; \
-			popd ; \
+			(cd $$dir ; make) ; \
 		fi \
 	done
 
@@ -20,8 +18,6 @@ default: $(TOP)/configs/current
 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/Makefile b/src/Makefile
index 7f8dfd09cd8..8003c5a95c5 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 4ddf09016ba..2b922fc021d 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 a90ac8275ac..114388ff5bb 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 5a961e96afe..2967106ea5d 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
-- 
2.30.2