Comparison

Makefile @ 4797:e239668aa6d2

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 29 Apr 2012 02:10:55 +0100
parent 4686:5fd661424b9f
child 5145:53f741a5a73a
comparison
equal deleted inserted replaced
4796:04a34287dc12 4797:e239668aa6d2
25 install -d $(CONFIG)/certs 25 install -d $(CONFIG)/certs
26 install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util 26 install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
27 install -m755 ./prosody.install $(BIN)/prosody 27 install -m755 ./prosody.install $(BIN)/prosody
28 install -m755 ./prosodyctl.install $(BIN)/prosodyctl 28 install -m755 ./prosodyctl.install $(BIN)/prosodyctl
29 install -m644 core/* $(SOURCE)/core 29 install -m644 core/* $(SOURCE)/core
30 install -m644 net/* $(SOURCE)/net 30 install -m644 net/*.lua $(SOURCE)/net
31 install -d $(SOURCE)/net/http
32 install -m644 net/http/*.lua $(SOURCE)/net/http
31 install -m644 util/*.lua $(SOURCE)/util 33 install -m644 util/*.lua $(SOURCE)/util
32 install -m644 util/*.so $(SOURCE)/util 34 install -m644 util/*.so $(SOURCE)/util
33 install -d $(SOURCE)/util/sasl 35 install -d $(SOURCE)/util/sasl
34 install -m644 util/sasl/* $(SOURCE)/util/sasl 36 install -m644 util/sasl/* $(SOURCE)/util/sasl
35 install -m644 plugins/*.lua $(MODULES) 37 umask 0022 && cp -r plugins/* $(MODULES)
36 install -d $(MODULES)/muc
37 install -m644 plugins/muc/* $(MODULES)/muc
38 install -m644 certs/* $(CONFIG)/certs 38 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 39 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 40 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 41 test -e prosody.version && install prosody.version $(SOURCE)/prosody.version || true
44 $(MAKE) install -C util-src 42 $(MAKE) install -C util-src
45 43