From: Mike Taylor <mike@indexdata.com>
Date: Wed, 12 Nov 2014 14:37:05 +0000 (+0000)
Subject: Part of MKWS-336.
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=a2387b0795626be1410c4a474e33530d3aa4efa5;p=mkws-moved-to-github.git

Part of MKWS-336.

Do not use dummy do-nothing version of yui-compressor if the real one
is missing. If it's not there, we want to know that.
---

diff --git a/src/Makefile b/src/Makefile
index ab04fc7..8d8b4c1 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}:
@@ -112,7 +111,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: