From: Wolfram Schneider <wosch@indexdata.dk>
Date: Fri, 27 Jun 2014 14:47:12 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws into MKWS-229
X-Git-Tag: 1.0.0~458^2~4^2~1
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=a6302cae8f48c3448a63b6cbd0d1ccab12232e2d;hp=-c

Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws into MKWS-229
---

a6302cae8f48c3448a63b6cbd0d1ccab12232e2d
diff --combined test/Makefile
index 7d91522,95a3c7b..57b5c46
--- a/test/Makefile
+++ b/test/Makefile
@@@ -35,7 -35,7 +35,7 @@@ clean-tmp
  	touch ${TMP_DIR}/.gitkeep
  
  mkws-complete-syntax-check:
 -	${MAKE} -C../src mkws-complete.min.js
 +	${MAKE} -C../tools/htdocs mkws-complete.min.js
  
  check: mkws-complete-syntax-check
  	@if [ ! -e node_modules ]; then echo "please run first: make node-modules"; exit 1; fi 
@@@ -50,7 -50,7 +50,7 @@@ phantomjs p: apache-stop apache-start _
  	${MAKE} apache-stop
  
  _phantomjs:
- 	./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
+ 	perl ./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
  
  mike-test:
  	$(MAKE) _phantomjs PHANTOMJS_URL=http://x.example.indexdata.com/jasmine-popup.html