diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-04-24 21:59:20 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-04-24 21:59:20 +0100 |
| commit | 15175bb828ab14cf0f35b221227beeeb46e4dd8f (patch) | |
| tree | fe8c013599dd847f7365cb1adab80ab8fe846de5 /Makefile | |
| parent | a5efef5aab5624e3a1cb4f1966e719738b859eda (diff) | |
| parent | 7cb22f77a78741a1bd085c6b3dc3b31f51c1fa09 (diff) | |
| download | prosody-15175bb828ab14cf0f35b221227beeeb46e4dd8f.tar.gz prosody-15175bb828ab14cf0f35b221227beeeb46e4dd8f.zip | |
Merge timber->trunk - thanks everyone!
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -32,12 +32,8 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin 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 + umask 0022 && cp -r plugins/* $(MODULES) install -m644 certs/* $(CONFIG)/certs - install -d $(MODULES)/adhoc - install -m644 plugins/adhoc/*.lua $(MODULES)/adhoc install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1 test -e $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua test -e prosody.version && install prosody.version $(SOURCE)/prosody.version || true |