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

diff --git a/Makefile b/Makefile
index 9504c36..4bb0cc2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,12 +18,9 @@ phantomjs p:
 
 # must be called once after GIT checkout
 setup: 
-#why?  ${MAKE} -C./tools/htdocs mkws-js-min
        ${MAKE} -C./test node-modules
 
-check: setup check-js
-       @echo ""
-       @echo "To run jasmine regression tests, type: make phantomjs"
+check: setup check-js phantomjs
 
 help:
        @echo "make [ all | setup | clean | distclean ]"