pz2 JS lib moved back to pazpar2 git repo

[mkws-moved-to-github.git] / tools / htdocs / Makefile

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index 8ad95ce..dc11392 100644 (file)
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -17,8 +17,8 @@ JQUERY_UI_URL=        http://code.jquery.com/ui/1.10.3/jquery-ui.js
 #JQUERY_UI_URL=        http://code.jquery.com/ui/1.8.0/jquery-ui.min.js
 
 MKWS_JS=       mkws-complete.js
-PZ2API_JS=     ../../../libjs-pz2/pz2api.1.js
-PZ2API_GIT=    ssh://git.indexdata.com:222/home/git/pub/libjs-pz2
+PZ2API_JS=     ../../../pazpar2/js/pz2.js
+PZ2API_GIT=    ssh://git.indexdata.com:222/home/git/pub/pazpar2
 
 DOCS = README.html README.odt README.pdf \
        whitepaper.html whitepaper.odt whitepaper.pdf
@@ -31,10 +31,10 @@ docs: $(DOCS)
 
 pz2api-git-checkout: 
        @if ! test -e ${PZ2API_JS}; then \
-           ( cd $$(dirname $$(dirname ${PZ2API_JS})); git clone ${PZ2API_GIT} ); \
+           ( cd ../../.. && git clone ${PZ2API_GIT} ); \
        fi
 
-mkws-js ${MKWS_JS}: mkws.js
+mkws-js ${MKWS_JS}: mkws.js handlebars-v1.1.2.js
        @if ! test -e ${PZ2API_JS}; then \
            echo "The pazpar2 JS file ${PZ2API_JS} does not exists."; \
            echo "Did you checked out the source from the git repo?"; \
@@ -44,9 +44,13 @@ mkws-js ${MKWS_JS}: mkws.js
        ( echo "/* created at: $$(date)"; \
          echo "   mkws.js GIT id: $$(git log mkws.js | head -n 1 | perl -npe 's,\S+\s+,,') */"; \
          curl -sSf ${JQUERY_URL} | perl -npe 's,sourceMappingURL=jquery.*map,,'; \
+         cat handlebars-v1.1.2.js; \
          cat ${PZ2API_JS} mkws.js ) > ${MKWS_JS}.new 
        mv -f ${MKWS_JS}.new ${MKWS_JS}
 
+handlebars-v1.1.2.js:
+       curl -sSf http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v1.1.2.js -o $@
+
 distclean: clean
 clean:
        rm -f ${MKWS_JS} $(DOCS)