From: Jason Skomorowski <jason@indexdata.com>
Date: Tue, 24 Jun 2014 16:10:36 +0000 (-0400)
Subject: Fix jQuery fix, $ gets clobbered by make even in single quotes.
X-Git-Tag: 1.0.0~478
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=c268cbe1e96f969c26a2105290046c4269db1f11;p=mkws-moved-to-github.git

Fix jQuery fix, $ gets clobbered by make even in single quotes.
---

diff --git a/src/Makefile b/src/Makefile
index 86ebb77..bc7ef19 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -46,7 +46,7 @@ mkws-js mkws-complete.js: Makefile mkws.js mkws-jquery.js ${HANDLEBARS_FILE} ${J
 	  echo "*/"; \
 	  cat ${JQUERY_FILE}; \
 	  cat ${JQUERY_JSON_FILE}; \
-	  echo 'mkws_jQuery = $.noConflict();'; \
+	  echo 'mkws_jQuery = jQuery.noConflict(true);'; \
 	  cat ${HANDLEBARS_FILE}; \
 	  cat ${PP2_FILE}; \
 	  cat  mkws.js; \