aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-03-05 20:50:17 +0000
committerMatthew Wild <mwild1@gmail.com>2016-03-05 20:50:17 +0000
commit9b896c90a7ffbc6986b554c2f454f70cef58a680 (patch)
tree50a8c372a53ab0e814fee4015df46d5686649052 /Makefile
parent3e0686f349b7aea1478bf54dc3ec1ab403ab8c2f (diff)
parent39dceba25851f3c9db32082f6217fbb2b7d6fc39 (diff)
downloadprosody-9b896c90a7ffbc6986b554c2f454f70cef58a680.tar.gz
prosody-9b896c90a7ffbc6986b554c2f454f70cef58a680.zip
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index a5cdbb37..06e67c9c 100644
--- a/Makefile
+++ b/Makefile
@@ -54,6 +54,7 @@ clean:
test:
cd tests && $(RUNWITH) test.lua 0
+ # Skipping: cd tests && RUNWITH=$(RUNWITH) ./test_util_json.sh
util/%.so:
$(MAKE) install -C util-src