Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 17 Oct 2015 19:31:43 +0200
changeset 6911 047becf393ca
parent 6908 0e81e3dab896 (current diff)
parent 6910 a24c9c1edd67 (diff)
child 6912 494938dec5d8
Merge 0.10->trunk
--- a/Makefile	Sun Oct 11 20:03:00 2015 +0200
+++ b/Makefile	Sat Oct 17 19:31:43 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