aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-10-17 19:30:58 +0200
committerKim Alvefur <zash@zash.se>2015-10-17 19:30:58 +0200
commit275c4489cb615a8f0deafe128f51b95e960f7253 (patch)
treee42f73b91b33777c6f3dc6b22a59403c201c4289
parent7835e7573e12cc36b70110705dd7b5571d26fbb9 (diff)
parentb5541c402f33ec62d405594d306dba4d53363351 (diff)
downloadprosody-275c4489cb615a8f0deafe128f51b95e960f7253.tar.gz
prosody-275c4489cb615a8f0deafe128f51b95e960f7253.zip
Merge 0.9->0.10
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e2eca7f1..130d8aa7 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin
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