diff options
| author | Matthew Wild <mwild1@gmail.com> | 2011-10-26 18:58:01 -0400 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2011-10-26 18:58:01 -0400 |
| commit | f6ea411e763a8817a808df9ba3f5b31f3f76aa28 (patch) | |
| tree | 3c4452b0bf9dc151823d559d91187f79dd601479 | |
| parent | cf1c72ddedf8eac847d444c14b935733c762e05d (diff) | |
| parent | 769db1e4e8ea5313aabcdef244a0a5bd7795ec98 (diff) | |
| download | prosody-f6ea411e763a8817a808df9ba3f5b31f3f76aa28.tar.gz prosody-f6ea411e763a8817a808df9ba3f5b31f3f76aa28.zip | |
Merge with Zash
| -rw-r--r-- | Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -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 |