diff options
| author | Kim Alvefur <zash@zash.se> | 2015-10-17 19:31:43 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-10-17 19:31:43 +0200 |
| commit | d76ba18dc300306e7c6334a26e05064bbf5d628c (patch) | |
| tree | 0548f664c5e4ab069b79105c4e0a5cbc8a7b6608 | |
| parent | ec268ace11395bb845a401852b9f49918947ae52 (diff) | |
| parent | 275c4489cb615a8f0deafe128f51b95e960f7253 (diff) | |
| download | prosody-d76ba18dc300306e7c6334a26e05064bbf5d628c.tar.gz prosody-d76ba18dc300306e7c6334a26e05064bbf5d628c.zip | |
Merge 0.10->trunk
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |