Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Sat, 17 Oct 2015 19:30:58 +0200
changeset 6910 a24c9c1edd67
parent 6907 633af47470c8 (current diff)
parent 6909 5a60b4705bc3 (diff)
child 6911 047becf393ca
child 6913 82765a4ec799
Merge 0.9->0.10
Makefile
--- a/Makefile	Sun Oct 11 20:00:15 2015 +0200
+++ b/Makefile	Sat Oct 17 19:30:58 2015 +0200
@@ -29,7 +29,7 @@
 	install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
 	install -m755 ./prosody.install $(BIN)/prosody
 	install -m755 ./prosodyctl.install $(BIN)/prosodyctl
-	install -m644 core/* $(SOURCE)/core
+	install -m644 core/*.lua $(SOURCE)/core
 	install -m644 net/*.lua $(SOURCE)/net
 	install -d $(SOURCE)/net/http $(SOURCE)/net/websocket
 	install -m644 net/http/*.lua $(SOURCE)/net/http