From: Wolfram Schneider <wosch@indexdata.dk>
Date: Thu, 13 Nov 2014 08:56:25 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=1dfb625168e68050741445453bc5f1c84819c040;hp=188ad50d28801f40cc33967a779632b8215c3ca6

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

diff --git a/src/Makefile b/src/Makefile
index 6b53072..bed0fb1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -14,7 +14,6 @@ PP2_URL = http://git.indexdata.com/?p=pazpar2.git;a=blob_plain;f=js/${PP2_FILE};
 
 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 @@ $(DEST)/mkws-complete.js: Makefile $(INSTALLED_DOWNLOADABLE) $(DEST)/mkws.js
 	mv -f $@.tmp $@
 
 %.min.js: %.js
-	${YUI_COMPRESSOR} $? > $@.tmp
+	yui-compressor $? > $@.tmp
 	mv -f $@.tmp $@
 
 $(DEST)/${HANDLEBARS_FILE}:
@@ -115,7 +114,7 @@ mkws-templates.js: templates/*.handlebars
 
 # 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: