Merge 0.7->trunk

[prosody.git] / Makefile

diff --git a/Makefile b/Makefile
index 93ca8c9be7eb4c089f6c6c12f1cfa216e6b044a0..4090d554336b46cddeffc63423452e077bac2602 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,13 +21,15 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin
        install -m750 -d $(DATA)
        install -d $(MAN)/man1
        install -d $(CONFIG)/certs
-       install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util $(SOURCE)/fallbacks
+       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 net/* $(SOURCE)/net
-       install -m644 util/* $(SOURCE)/util
-       install -m644 fallbacks/* $(SOURCE)/fallbacks
+       install -m644 util/*.lua $(SOURCE)/util
+       install -m644 util/*.so $(SOURCE)/util
+       install -d $(SOURCE)/util/sasl
+       install -m644 util/sasl/* $(SOURCE)/util/sasl
        install -m644 plugins/*.lua $(MODULES)
        install -d $(MODULES)/muc
        install -m644 plugins/muc/* $(MODULES)/muc