summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Clerc <xavier.clerc@inria.fr>2010-01-28 15:50:18 +0000
committerXavier Clerc <xavier.clerc@inria.fr>2010-01-28 15:50:18 +0000
commit23a54e79fc7e55abc9cfea20b7f449c97edbcb56 (patch)
tree9de4d38d84caba9e8738bae426b62df6edcb7820
parent2c54e3a4fac7c846eb6a8f916903189e57546716 (diff)
downloadocaml-23a54e79fc7e55abc9cfea20b7f449c97edbcb56.tar.gz
Fix for incompatibility with respect to BSD make ('-C' option)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9596 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--testsuite/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/Makefile b/testsuite/Makefile
index 1f66355cd6..f7999d9a49 100644
--- a/testsuite/Makefile
+++ b/testsuite/Makefile
@@ -29,16 +29,16 @@ one: lib
@if [ -z $(DIR) ]; then echo "No value set for variable 'DIR'."; exit 1; fi
@if [ ! -d $(DIR) ]; then echo "Directory '$(DIR)' does not exist."; exit 1; fi
@echo "Running tests from '$$DIR' ..."
- @$(MAKE) -C $(DIR) BASEDIR=$(BASEDIR)
+ @(cd $(DIR) && $(MAKE) BASEDIR=$(BASEDIR) && cd ../..)
lib: FORCE
- @$(MAKE) -s -C lib BASEDIR=$(BASEDIR)
+ @(cd lib && $(MAKE) -s BASEDIR=$(BASEDIR) && cd ..)
clean: FORCE
- @$(MAKE) -C lib BASEDIR=$(BASEDIR) clean
+ @(cd lib && $(MAKE) BASEDIR=$(BASEDIR) clean && cd ..)
@for file in tests/*; do \
if [ -d $$file ]; then \
- $(MAKE) -C $$file BASEDIR=$(BASEDIR) clean; \
+ (cd $$file && $(MAKE) BASEDIR=$(BASEDIR) clean && cd ../..); \
fi \
done