Comparison

Makefile @ 6908:047becf393ca

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 17 Oct 2015 19:31:43 +0200 (2015-10-17)
parent 6907:a24c9c1edd67
child 7071:d9e620adfb64
comparison
equal deleted inserted replaced
6905:0e81e3dab896 6908:047becf393ca
27 install -d $(MAN)/man1 27 install -d $(MAN)/man1
28 install -d $(CONFIG)/certs 28 install -d $(CONFIG)/certs
29 install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util 29 install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
30 install -m755 ./prosody.install $(BIN)/prosody 30 install -m755 ./prosody.install $(BIN)/prosody
31 install -m755 ./prosodyctl.install $(BIN)/prosodyctl 31 install -m755 ./prosodyctl.install $(BIN)/prosodyctl
32 install -m644 core/* $(SOURCE)/core 32 install -m644 core/*.lua $(SOURCE)/core
33 install -m644 net/*.lua $(SOURCE)/net 33 install -m644 net/*.lua $(SOURCE)/net
34 install -d $(SOURCE)/net/http $(SOURCE)/net/websocket 34 install -d $(SOURCE)/net/http $(SOURCE)/net/websocket
35 install -m644 net/http/*.lua $(SOURCE)/net/http 35 install -m644 net/http/*.lua $(SOURCE)/net/http
36 install -m644 net/websocket/*.lua $(SOURCE)/net/websocket 36 install -m644 net/websocket/*.lua $(SOURCE)/net/websocket
37 install -m644 util/*.lua $(SOURCE)/util 37 install -m644 util/*.lua $(SOURCE)/util