From 4e0c802fc3e16ea340864b878e0d61918fda5700 Mon Sep 17 00:00:00 2001 From: Christine Baker Date: Sun, 3 Apr 2011 19:28:50 -0700 Subject: [PATCH] Makefile now works on a Mac --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index b823a16..dd96b17 100644 --- a/Makefile +++ b/Makefile @@ -13,16 +13,16 @@ VER_SED = sed s/@VERSION/"${VER}"/ DATE = $$(git log -1 --pretty=format:%ad) DATE_SED = sed s/@DATE/"${DATE}"/ -JQ = $$(sed -n "s/.*JQUERY\s*=\s*[\"']\(.*\)[\"'].*/\1/p" "${SRC_DIR}/_loader.js") -JQUI = $$(sed -n "s/.*JQUERY_UI\s*=\s*[\"']\(.*\)[\"'].*/\1/p" "${SRC_DIR}/_loader.js") +JQ = $$(sed -nE "s/.*JQUERY[ \t]*=[ \t]*[\"'](.*)[\"'].*/\1/p" "${SRC_DIR}/_loader.js") +JQUI = $$(sed -nE "s/.*JQUERY_UI[ \t]*=[ \t]*[\"'](.*)[\"'].*/\1/p" "${SRC_DIR}/_loader.js") DEMO_FILES = $$(cd ${DEMOS_DIR}; find . -mindepth 1 -maxdepth 1 -type f) DEMO_SUBDIRS = $$(cd ${DEMOS_DIR}; find . -mindepth 1 -maxdepth 1 -type d) -DEMO_RE = \(]*_loader\.js[^>]*><\/script>\|\)\s* -DEMO_SED = sed -n "1h;1!H;\$${;g;s/${DEMO_RE}//g;p;}" +DEMO_RE = (]*_loader\.js[^>]*><\/script>|)[^<]* +DEMO_SED = sed -nE '1h;1!H;$${;g;s/${DEMO_RE}//g;p;}' -JS_SED = sed -n "s/\s*js([\"']\(.*\)[\"']).*/\1/p" -CSS_SED = sed -n "s/\s*css([\"']\(.*\)[\"']).*/\1/p" +JS_SED = sed -nE "s/[ \t]*js\([\"'](.*)[\"']\).*/\1/p" +CSS_SED = sed -nE "s/[ \t]*css\([\"'](.*)[\"']\).*/\1/p" concat_js = \ files=$$(cat "$(1)/_loader.js" | ${JS_SED}); \