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
configurable yui-compressor program name
[mkws-moved-to-github.git]
/
tools
/
htdocs
/
Makefile
diff --git
a/tools/htdocs/Makefile
b/tools/htdocs/Makefile
index
1f78719
..
4c81aa1
100644
(file)
--- a/
tools/htdocs/Makefile
+++ b/
tools/htdocs/Makefile
@@
-14,6
+14,9
@@
PP2_URL = http://git.indexdata.com/?p=pazpar2.git;a=blob_plain;f=js/${PP2_FILE};
JQUERY_UI_URL = http://code.jquery.com/ui/1.10.3/jquery-ui.js
VERSION = $(shell tr -d '\012' < ${SRC}/VERSION)
JQUERY_UI_URL = http://code.jquery.com/ui/1.10.3/jquery-ui.js
VERSION = $(shell tr -d '\012' < ${SRC}/VERSION)
+#HANDLEBARS=handlebars
+HANDLEBARS=../../test/node_modules/.bin/handlebars
+YUI_COMPRESSOR=yui-compressor
COMPONENTS = ${SRC}/mkws-handlebars.js \
${SRC}/mkws-core.js \
COMPONENTS = ${SRC}/mkws-handlebars.js \
${SRC}/mkws-core.js \
@@
-56,11
+59,11
@@
mkws-js mkws-complete.js: Makefile mkws.js ${HANDLEBARS_FILE} ${JQUERY_FILE} ${J
mv -f mkws-complete.js.tmp mkws-complete.js
%.min.js: %.js
mv -f mkws-complete.js.tmp mkws-complete.js
%.min.js: %.js
- yui-compressor $? > $@.tmp
+ ${YUI_COMPRESSOR} $? > $@.tmp
mv -f $@.tmp $@
mkws-syntax-check:
mv -f $@.tmp $@
mkws-syntax-check:
- yui-compressor mkws.js >/dev/null
+ ${YUI_COMPRESSOR} mkws.js >/dev/null
${HANDLEBARS_FILE}:
curl -sSf ${HANDLEBARS_URL} -o $@.tmp
${HANDLEBARS_FILE}:
curl -sSf ${HANDLEBARS_URL} -o $@.tmp
@@
-97,7
+100,7
@@
mkws.js: mkws-templates.js $(COMPONENTS) Makefile
chmod 444 $@
mkws-templates.js:
chmod 444 $@
mkws-templates.js:
- handlebars -n mkws.defaultTemplates ${SRC}/*.templates/*.handlebars -f ${SRC}/mkws-templates.js
+ ${HANDLEBARS} -n mkws.defaultTemplates ${SRC}/*.templates/*.handlebars -f ${SRC}/mkws-templates.js
mkws-html-includes:
echo $(COMPONENTS) | perl -npe "s,${SRC},,g; s/\s+/\0/g" | \
mkws-html-includes:
echo $(COMPONENTS) | perl -npe "s,${SRC},,g; s/\s+/\0/g" | \