From c268cbe1e96f969c26a2105290046c4269db1f11 Mon Sep 17 00:00:00 2001 From: Jason Skomorowski Date: Tue, 24 Jun 2014 12:10:36 -0400 Subject: [PATCH] Fix jQuery fix, $ gets clobbered by make even in single quotes. --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; \ -- 1.7.10.4