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

diff --combined src/Makefile
index 6b53072,8d8b4c1..bed0fb1
--- 1/src/Makefile
--- 2/src/Makefile
+++ b/src/Makefile
@@@ -14,7 -14,6 +14,6 @@@ PP2_URL = http://git.indexdata.com/?p=p
  
  VERSION = $(shell tr -d '\012' < VERSION)
  HANDLEBARS = ../test/node_modules/.bin/handlebars
- YUI_COMPRESSOR = $(shell which yui-compressor ../test/bin/yui-compressor | head -1)
  
  COMPONENTS = mkws-handlebars.js \
        mkws-core.js \
@@@ -59,7 -58,7 +58,7 @@@ $(DEST)/mkws-complete.js: Makefile $(IN
        mv -f $@.tmp $@
  
  %.min.js: %.js
-       ${YUI_COMPRESSOR} $? > $@.tmp
+       yui-compressor $? > $@.tmp
        mv -f $@.tmp $@
  
  $(DEST)/${HANDLEBARS_FILE}:
@@@ -90,9 -89,6 +89,9 @@@ $(DEST)/VERSION: VERSIO
        chmod 444 $@
  
  release: $(INSTALLED_RELEASABLE)
 +      @if ! which yui-compressor >/dev/null; then \
 +              echo "*** please install the yui-compressor program"; exit 1; \
 +      fi
        if [ -f ${DEST}/releases/mkws-$(VERSION).js ]; then \
                echo "*** There is already a release $(VERSION)"; \
        else \
@@@ -115,7 -111,7 +114,7 @@@ mkws-templates.js: templates/*.handleba
  
  # Checks that the JavaScript can be parsed
  syntax-check: $(DEST)/mkws.js
-       ${YUI_COMPRESSOR} $(DEST)/mkws.js >/dev/null
+       yui-compressor $(DEST)/mkws.js >/dev/null
  
  # Emits a list of <script> elements to include in HTML applications
  html-includes: