prosody
161cccfdf015
Makefile

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

Makefile @ 6843:161cccfdf015

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 22 Sep 2015 01:31:52 +0200
parent 6840:eeefe8d42b8b
child 6883:954a8a8c46d6
comparison
equal deleted inserted replaced
6839:298182fd2387 6843:161cccfdf015
64 64
65 prosody.cfg.lua.install: prosody.cfg.lua.dist 65 prosody.cfg.lua.install: prosody.cfg.lua.dist
66 sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' $^ > $@ 66 sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' $^ > $@
67 67
68 prosody.version: $(wildcard prosody.release .hg/dirstate) 68 prosody.version: $(wildcard prosody.release .hg/dirstate)
69 test -d .hg/dirstate && \ 69 test -f .hg/dirstate && \
70 hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@ || true 70 hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@ || true
71 test -f prosody.release && \ 71 test -f prosody.release && \
72 cp prosody.release $@ || true 72 cp prosody.release $@ || true