projects
/
mkws-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws
[mkws-moved-to-github.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index
6b53072
..
bed0fb1
100644
(file)
--- 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
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 \
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
mv -f $@.tmp $@
%.min.js: %.js
- ${YUI_COMPRESSOR} $? > $@.tmp
+ yui-compressor $? > $@.tmp
mv -f $@.tmp $@
$(DEST)/${HANDLEBARS_FILE}:
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
# 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:
# Emits a list of <script> elements to include in HTML applications
html-includes: