Diff

makefile @ 11750:a8760562a096

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 30 Aug 2021 15:22:01 +0200
parent 10882:1999bb052d49
parent 11748:88ba05494d17
child 12313:469e4453ed01
line wrap: on
line diff
--- 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