X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2FMakefile;h=71da3ee9725c48468a859bd7e1b68c9b1b86b1cb;hb=0d3c96837508e3b70025735342ecd5cbc2684070;hp=1f787198503fef10588fa24644135590c7e7d70f;hpb=bb11e0f2dbc573dfa4d77b1de75ae5ce301fa051;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index 1f78719..71da3ee 100644
--- 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)
+#HANDLEBARS=handlebars	
+HANDLEBARS=../../test/node_modules/.bin/handlebars 
+YUI_COMPRESSOR= $(shell which yui-compressor ../../test/bin/yui-compressor | head -1)
 
 COMPONENTS = ${SRC}/mkws-handlebars.js \
 	${SRC}/mkws-core.js \
@@ -32,7 +35,7 @@ COMPONENTS = ${SRC}/mkws-handlebars.js \
 	${SRC}/mkws-widget-builder.js
 
 GENERATED = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE} \
-	mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js mkws-templates.js
+	mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js ${SRC}/mkws-templates.js
 
 **make-default**: all
 
@@ -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
-	yui-compressor $? > $@.tmp
+	${YUI_COMPRESSOR} $? > $@.tmp
 	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
@@ -90,14 +93,15 @@ release: mkws.js mkws-complete.js mkws.min.js mkws-complete.min.js
 		echo "Made release $(VERSION)"; \
 	fi
 
-mkws.js: mkws-templates.js $(COMPONENTS) Makefile
+mkws.js: $(COMPONENTS) Makefile
 	rm -f $@
 	cat ${COMPONENTS} > $@.tmp
 	mv -f $@.tmp $@
 	chmod 444 $@
 
-mkws-templates.js:
-	handlebars -n mkws.defaultTemplates ${SRC}/*.templates/*.handlebars -f ${SRC}/mkws-templates.js
+${SRC}/mkws-templates.js: ${SRC}/*.templates/*.handlebars
+	${HANDLEBARS} -n mkws.defaultTemplates ${SRC}/*.templates/*.handlebars -f $@.tmp
+	mv -f $@.tmp $@
 
 mkws-html-includes: 
 	echo $(COMPONENTS) | perl -npe "s,${SRC},,g; s/\s+/\0/g" | \