aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-10-26 18:58:01 -0400
committerMatthew Wild <mwild1@gmail.com>2011-10-26 18:58:01 -0400
commitf6ea411e763a8817a808df9ba3f5b31f3f76aa28 (patch)
tree3c4452b0bf9dc151823d559d91187f79dd601479 /Makefile
parentcf1c72ddedf8eac847d444c14b935733c762e05d (diff)
parent769db1e4e8ea5313aabcdef244a0a5bd7795ec98 (diff)
downloadprosody-f6ea411e763a8817a808df9ba3f5b31f3f76aa28.tar.gz
prosody-f6ea411e763a8817a808df9ba3f5b31f3f76aa28.zip
Merge with Zash
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 0fa8b28e..9d0c3d23 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,6 @@ prosody.cfg.lua.install: prosody.cfg.lua.dist
sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' $^ > $@
prosody.version: $(wildcard prosody.release .hg/dirstate)
- test -e .hg/dirstate && \
- hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@ || true
- test -f prosody.release && \
- cp prosody.release $@ || true
+ test -e .hg/dirstate && hexdump -n6 -e'6/1 "%02x"' .hg/dirstate \
+ > $@
+ test -f prosody.release && cp prosody.release $@ || true