mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.11->trunk

Browse source
This commit is contained in:
Kim Alvefur 2021-08-30 15:22:01 +02:00
commit c013345fbb
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
makefile
View file

@ -101,12 +101,12 @@ prosody.cfg.lua.install: prosody.cfg.lua.dist
sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > $@ sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > $@
prosody.version: prosody.version:
test -f prosody.release && \ if [ -f prosody.release ]; then \
cp prosody.release $@ || \ cp prosody.release $@; \
test -f .hg_archival.txt && \ elif [ -f .hg_archival.txt ]; then \
sed -n 's/^node: \(............\).*/\1/p' .hg_archival.txt > $@ || \ sed -n 's/^node: \(............\).*/\1/p' .hg_archival.txt > $@; \
test -f .hg/dirstate && \ elif [ -f .hg/dirstate ]; then \
hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@ || \ hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@; \
echo unknown > $@ else \
echo unknown > $@; \
fi