Merge 0.9->0.10

[prosody.git] / Makefile

diff --git a/Makefile b/Makefile
index 0b704e5a0b7d0c6486eb6c7d294ef37eb1e7ecc3..f6e1e3f2deb1bff4eb6b5cc2937f6cd375c85eb9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,8 +31,9 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin
        install -m755 ./prosodyctl.install $(BIN)/prosodyctl
        install -m644 core/* $(SOURCE)/core
        install -m644 net/*.lua $(SOURCE)/net
-       install -d $(SOURCE)/net/http
+       install -d $(SOURCE)/net/http $(SOURCE)/net/websocket
        install -m644 net/http/*.lua $(SOURCE)/net/http
+       install -m644 net/websocket/*.lua $(SOURCE)/net/websocket
        install -m644 util/*.lua $(SOURCE)/util
        install -m644 util/*.so $(SOURCE)/util
        install -d $(SOURCE)/util/sasl