From: Wolfram Schneider <wosch@indexdata.dk>
Date: Tue, 23 Sep 2014 12:00:10 +0000 (+0000)
Subject: use handlebars program from node modules checkout
X-Git-Tag: 1.0.0~324^2~16
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=0f54c9e55c3bf474c1bd87680ad0f4911cd44c36

use handlebars program from node modules checkout
---

diff --git a/Makefile b/Makefile
index ebcb40d..dcefe0d 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,9 @@ phantomjs p p-all phantomjs-all jsb:
 	${MAKE} -C./test $@
 
 # must be called once after GIT checkout
-setup: all
+setup:
 	${MAKE} -C./test node-modules
+	${MAKE} all
 
 check: setup check-js phantomjs
 
diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index 1f78719..db7c2a6 100644
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -14,6 +14,8 @@ 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 
 
 COMPONENTS = ${SRC}/mkws-handlebars.js \
 	${SRC}/mkws-core.js \
@@ -97,7 +99,7 @@ mkws.js: mkws-templates.js $(COMPONENTS) Makefile
 	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" | \