diff options
| author | Kim Alvefur <zash@zash.se> | 2021-08-30 15:22:01 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2021-08-30 15:22:01 +0200 |
| commit | c013345fbbe715de1140ca2fb7efe6e4554e7326 (patch) | |
| tree | 3b4a776d90cb6d32dfce2bdf755b618368480e69 | |
| parent | 52a9ddd22a9cbf0af9a9cae9fb7ce244c5ab4f35 (diff) | |
| parent | 5f69d4a1292c2766cc70074478aab17258b8f149 (diff) | |
| download | prosody-c013345fbbe715de1140ca2fb7efe6e4554e7326.tar.gz prosody-c013345fbbe715de1140ca2fb7efe6e4554e7326.zip | |
Merge 0.11->trunk
| -rw-r--r-- | makefile | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -101,12 +101,12 @@ prosody.cfg.lua.install: prosody.cfg.lua.dist sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > $@ prosody.version: - test -f prosody.release && \ - cp prosody.release $@ || \ - test -f .hg_archival.txt && \ - sed -n 's/^node: \(............\).*/\1/p' .hg_archival.txt > $@ || \ - test -f .hg/dirstate && \ - hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@ || \ - echo unknown > $@ - - + if [ -f prosody.release ]; then \ + cp prosody.release $@; \ + elif [ -f .hg_archival.txt ]; then \ + sed -n 's/^node: \(............\).*/\1/p' .hg_archival.txt > $@; \ + elif [ -f .hg/dirstate ]; then \ + hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@; \ + else \ + echo unknown > $@; \ + fi |