# HG changeset patch # User Kim Alvefur # Date 1630329721 -7200 # Node ID a8760562a096a6d7d56c6f41163398bfe4ae8761 # Parent 83d6d6a70edfe5d72bb3e55b0bb27f7ee8f2d92c# Parent 88ba05494d17a29670896ba5d9dc8ad5bf545de3 Merge 0.11->trunk diff -r 83d6d6a70edf -r a8760562a096 makefile --- a/makefile Sun Aug 29 15:04:47 2021 +0200 +++ b/makefile Mon Aug 30 15:22:01 2021 +0200 @@ -101,12 +101,12 @@ 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