Software / code / prosody
Comparison
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 |
comparison
equal
deleted
inserted
replaced
| 11749:83d6d6a70edf | 11750:a8760562a096 |
|---|---|
| 99 | 99 |
| 100 prosody.cfg.lua.install: prosody.cfg.lua.dist | 100 prosody.cfg.lua.install: prosody.cfg.lua.dist |
| 101 sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > $@ | 101 sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > $@ |
| 102 | 102 |
| 103 prosody.version: | 103 prosody.version: |
| 104 test -f prosody.release && \ | 104 if [ -f prosody.release ]; then \ |
| 105 cp prosody.release $@ || \ | 105 cp prosody.release $@; \ |
| 106 test -f .hg_archival.txt && \ | 106 elif [ -f .hg_archival.txt ]; then \ |
| 107 sed -n 's/^node: \(............\).*/\1/p' .hg_archival.txt > $@ || \ | 107 sed -n 's/^node: \(............\).*/\1/p' .hg_archival.txt > $@; \ |
| 108 test -f .hg/dirstate && \ | 108 elif [ -f .hg/dirstate ]; then \ |
| 109 hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@ || \ | 109 hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@; \ |
| 110 echo unknown > $@ | 110 else \ |
| 111 | 111 echo unknown > $@; \ |
| 112 | 112 fi |