Don't use pushd/popd.

diff --git a/Makefile b/Makefile
index 853bc3c6eee2998137ce1ebadeb973f533c6d9f4..5c954e574daef6dab175060792c926deeed980b4 100644 (file)
--- 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 f925de5860b8c42d0dbc431f5f465f4a42e96963..6870630eb51f480f10ee0b5d59b5aa1987670226 100644 (file)
--- 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 7f8dfd09cd89f2e1ec86c2f0473c4b1aadbf5616..8003c5a95c5d7634dd4862b08cd35c2369c3a037 100644 (file)
--- 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 4ddf09016ba8d038b2e3076258f2a82865861c87..2b922fc021dc7afe50c4a0c2032c4662f2824779 100644 (file)
--- 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 a90ac8275acba334e97cde111b5ba49269a38c50..114388ff5bbd093941351d1c8914e855c3e60758 100644 (file)
--- 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 5a961e96afe2340180cd6249b6361a382d381350..2967106ea5d1b785f3802c1e683a4b2a7c75c601 100644 (file)
--- 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