diff options
author | Kim Alvefur <zash@zash.se> | 2017-02-04 01:08:27 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-02-04 01:08:27 +0100 |
commit | 314ce335b9a3f23224237f829c9b166eeb345187 (patch) | |
tree | 300927642fc0f857d9ea96ab4b1e2bc2d4c20950 /Makefile | |
parent | c534c1414eec471209c54a917152593da3198c90 (diff) | |
parent | 0f6de0b8f9c41090298ca0b3f998832971ff51b2 (diff) | |
download | prosody-314ce335b9a3f23224237f829c9b166eeb345187.tar.gz prosody-314ce335b9a3f23224237f829c9b166eeb345187.zip |
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -44,12 +44,13 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin $(INSTALL_DATA) util/*.so $(SOURCE)/util $(MKDIR) $(SOURCE)/util/sasl $(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl - $(MKDIR) $(MODULES)/mod_s2s $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc + $(MKDIR) $(MODULES)/mod_s2s $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam $(INSTALL_DATA) plugins/*.lua $(MODULES) $(INSTALL_DATA) plugins/mod_s2s/*.lua $(MODULES)/mod_s2s $(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub $(INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc $(INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc + $(INSTALL_DATA) plugins/mod_mam/*.lua $(MODULES)/mod_mam $(INSTALL_DATA) certs/* $(CONFIG)/certs $(INSTALL_DATA) man/prosodyctl.man $(MAN)/man1/prosodyctl.1 test -f $(CONFIG)/prosody.cfg.lua || $(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua |