From 26481ab36ba7cee2676555bda31d5135b77a6d26 Mon Sep 17 00:00:00 2001 From: evomarc Date: Thu, 18 Oct 2001 04:34:58 +0000 Subject: [PATCH] Modified the Makefile.am in main dir, and Makefile in tutorial dir to remove all pushd/popd as they don't exist in Windows/bash --- eo/Makefile.am | 12 ++++++------ eo/tutorial/Makefile | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eo/Makefile.am b/eo/Makefile.am index 3c2b9a8a..a574de0c 100644 --- a/eo/Makefile.am +++ b/eo/Makefile.am @@ -15,22 +15,22 @@ EXTRA_DIST=LICENSE ############################################################################### lib: - pushd src; $(MAKE) all; popd + cd src; $(MAKE) all; cd .. # so that make doc always compiles the doc ... doc: doc/eo.cfg - pushd doc; $(MAKE) doc; touch eo.cfg; popd + cd doc; $(MAKE) doc; touch eo.cfg; cd .. tutorial: - pushd tutorial; $(MAKE) all; popd + cd tutorial; $(MAKE) all; cd .. app: - pushd app; $(MAKE) all; popd + cd app; $(MAKE) all; cd .. all: - for i in $(SUBDIRS); do pushd $$i && $(MAKE) all; popd; done + for i in $(SUBDIRS); do cd $$i && $(MAKE) all; cd ..; done clean: - for i in $(SUBDIRS); do pushd $$i && $(MAKE) clean; popd; done + for i in $(SUBDIRS); do cd $$i && $(MAKE) clean; cd ..; done ############################################################################### diff --git a/eo/tutorial/Makefile b/eo/tutorial/Makefile index 6c415301..8bd739e4 100644 --- a/eo/tutorial/Makefile +++ b/eo/tutorial/Makefile @@ -1,7 +1,7 @@ SUBDIRS = Lesson1 Lesson2 Lesson3 Lesson4 all: - for i in $(SUBDIRS); do pushd $$i && $(MAKE) all; popd; done + for i in $(SUBDIRS); do cd $$i && $(MAKE) all; cd ..; done lesson1 : cd Lesson1; make @@ -23,4 +23,4 @@ distdir : check : clean: - for i in $(SUBDIRS); do pushd $$i && $(MAKE) clean; popd; done + for i in $(SUBDIRS); do cd $$i && $(MAKE) clean; cd ..; done