Software / code / prosody
Comparison
Makefile @ 4684:dc70c4ffb66d
Merge timber->trunk - thanks everyone!
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 24 Apr 2012 21:59:20 +0100 |
| parent | 4628:087f4b437bd2 |
| child | 4686:5fd661424b9f |
comparison
equal
deleted
inserted
replaced
| 4529:12621337471f | 4684:dc70c4ffb66d |
|---|---|
| 30 install -m644 net/* $(SOURCE)/net | 30 install -m644 net/* $(SOURCE)/net |
| 31 install -m644 util/*.lua $(SOURCE)/util | 31 install -m644 util/*.lua $(SOURCE)/util |
| 32 install -m644 util/*.so $(SOURCE)/util | 32 install -m644 util/*.so $(SOURCE)/util |
| 33 install -d $(SOURCE)/util/sasl | 33 install -d $(SOURCE)/util/sasl |
| 34 install -m644 util/sasl/* $(SOURCE)/util/sasl | 34 install -m644 util/sasl/* $(SOURCE)/util/sasl |
| 35 install -m644 plugins/*.lua $(MODULES) | 35 umask 0022 && cp -r plugins/* $(MODULES) |
| 36 install -d $(MODULES)/muc | |
| 37 install -m644 plugins/muc/* $(MODULES)/muc | |
| 38 install -m644 certs/* $(CONFIG)/certs | 36 install -m644 certs/* $(CONFIG)/certs |
| 39 install -d $(MODULES)/adhoc | |
| 40 install -m644 plugins/adhoc/*.lua $(MODULES)/adhoc | |
| 41 install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1 | 37 install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1 |
| 42 test -e $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua | 38 test -e $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua |
| 43 test -e prosody.version && install prosody.version $(SOURCE)/prosody.version || true | 39 test -e prosody.version && install prosody.version $(SOURCE)/prosody.version || true |
| 44 $(MAKE) install -C util-src | 40 $(MAKE) install -C util-src |
| 45 | 41 |