From: Mike Taylor <mike@indexdata.com>
Date: Thu, 16 Oct 2014 08:53:42 +0000 (+0100)
Subject: Fix MKWS-292
X-Git-Tag: 1.0.0~190^2
X-Git-Url: http://jsfdemo.indexdata.com/?a=commitdiff_plain;h=aad6415f094c40be6025a1e2ceb6b6586b86f6ac;p=mkws-moved-to-github.git

Fix MKWS-292

Use ${MAKE} for all recursive invocations rather than raw make.
---

diff --git a/test/Makefile b/test/Makefile
index e4b204b..c7505a7 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -25,7 +25,7 @@ all: check
 clean:
 	rm -f mkws-error.png mkws-error.html 
 	rm -f images/*.png
-	make -C./widgets $@
+	${MAKE} -C./widgets $@
 
 distclean: clean clean-tmp clean-error
 	rm -rf node_modules
@@ -82,7 +82,7 @@ screenshot-indexdata:
 	ls -l ${IMAGES}
 
 screenshots:
-	make -C ./widgets $@
+	${MAKE} -C ./widgets $@
 
 jsbeautifier jsb indent:
 	for i in package.json ./spec*/*.js ./js/*.js ./phantom/*.js; do \
diff --git a/test/widgets/Makefile b/test/widgets/Makefile
index dbd9bbf..70a19c0 100644
--- a/test/widgets/Makefile
+++ b/test/widgets/Makefile
@@ -30,9 +30,9 @@ screenshot:
 
 screenshots: clean
 	for i in $$(cat url.txt); do \
-	  make PHANTOMJS_URL="$$i" TIMEOUT=4 screenshot; \
+	  ${MAKE} PHANTOMJS_URL="$$i" TIMEOUT=4 screenshot; \
 	done; wait
-	make index
+	${MAKE} index
 
 index:
 	cd ${IMAGES}; ls -tr *.png | perl -ne 'chomp; print qq{<h2>$$_</h2><img src="$$_"/><br/><br/><p/>\n}' > index.html