aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-09-02 18:55:35 +0100
committerMatthew Wild <mwild1@gmail.com>2015-09-02 18:55:35 +0100
commitee2c04d00330a6ac76b6360d2d06b02bcc001546 (patch)
tree75ae2e07fd0ffea8a7063e9fbc3e5dbd0108d619 /Makefile
parent0944fb2e1b3c6b10fef40e93e0ba0ae72795acac (diff)
parent63f8291d160b050741e804e5a58e392381555e14 (diff)
downloadprosody-ee2c04d00330a6ac76b6360d2d06b02bcc001546.tar.gz
prosody-ee2c04d00330a6ac76b6360d2d06b02bcc001546.zip
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index f6e1e3f2..492d7ea5 100644
--- a/Makefile
+++ b/Makefile
@@ -41,8 +41,8 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin
umask 0022 && cp -r plugins/* $(MODULES)
install -m644 certs/* $(CONFIG)/certs
install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1
- test -e $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
- test -e prosody.version && install -m644 prosody.version $(SOURCE)/prosody.version || true
+ test -f $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
+ test -f prosody.version && install -m644 prosody.version $(SOURCE)/prosody.version || true
$(MAKE) install -C util-src
clean:
@@ -66,7 +66,7 @@ prosody.cfg.lua.install: prosody.cfg.lua.dist
sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' $^ > $@
prosody.version: $(wildcard prosody.release .hg/dirstate)
- test -e .hg/dirstate && \
+ test -d .hg/dirstate && \
hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@ || true
test -f prosody.release && \
cp prosody.release $@ || true