Comparison

Makefile @ 7690:861a747e441b

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 08 Oct 2016 21:07:12 +0200
parent 7689:97c013e8f002
child 7790:0310ab4f277f
comparison
equal deleted inserted replaced
7687:ae24deae6488 7690:861a747e441b
44 $(INSTALL_DATA) util/*.so $(SOURCE)/util 44 $(INSTALL_DATA) util/*.so $(SOURCE)/util
45 $(MKDIR) $(SOURCE)/util/sasl 45 $(MKDIR) $(SOURCE)/util/sasl
46 $(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl 46 $(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl
47 $(MKDIR) $(MODULES)/mod_s2s $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc 47 $(MKDIR) $(MODULES)/mod_s2s $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc
48 $(INSTALL_DATA) plugins/*.lua $(MODULES) 48 $(INSTALL_DATA) plugins/*.lua $(MODULES)
49 $(INSTALL_DATA) plugins/mod_s2s/*.lua $(MODULES) 49 $(INSTALL_DATA) plugins/mod_s2s/*.lua $(MODULES)/mod_s2s
50 $(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES) 50 $(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub
51 $(INSTALL_DATA) plugins/adhoc/*.lua $(MODULES) 51 $(INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc
52 $(INSTALL_DATA) plugins/muc/*.lua $(MODULES) 52 $(INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc
53 $(INSTALL_DATA) certs/* $(CONFIG)/certs 53 $(INSTALL_DATA) certs/* $(CONFIG)/certs
54 $(INSTALL_DATA) man/prosodyctl.man $(MAN)/man1/prosodyctl.1 54 $(INSTALL_DATA) man/prosodyctl.man $(MAN)/man1/prosodyctl.1
55 test -f $(CONFIG)/prosody.cfg.lua || $(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua 55 test -f $(CONFIG)/prosody.cfg.lua || $(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
56 -test -f prosody.version && $(INSTALL_DATA) prosody.version $(SOURCE)/prosody.version 56 -test -f prosody.version && $(INSTALL_DATA) prosody.version $(SOURCE)/prosody.version
57 $(MAKE) install -C util-src 57 $(MAKE) install -C util-src