diff options
| author | Kim Alvefur <zash@zash.se> | 2015-09-27 00:37:18 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-09-27 00:37:18 +0200 |
| commit | 0e4e770687183e78e70ea16d056c039062b3708f (patch) | |
| tree | 2e6a296aac1eb2dbf8f40a56235d32870b270b99 /Makefile | |
| parent | e8cb3e473a07e28039c0b41ab1ee83db524364f5 (diff) | |
| parent | b9c17069eac26443575ceee3674a12cb41df4f52 (diff) | |
| download | prosody-0e4e770687183e78e70ea16d056c039062b3708f.tar.gz prosody-0e4e770687183e78e70ea16d056c039062b3708f.zip | |
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 22 |
1 files changed, 15 insertions, 7 deletions
@@ -18,7 +18,7 @@ INSTALLEDDATA = $(DATADIR) all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version $(MAKE) -C util-src install ifeq ($(EXCERTS),yes) - $(MAKE) -C certs localhost.crt example.com.crt || true + -$(MAKE) -C certs localhost.crt example.com.crt endif install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodings.so util/encodings.so util/pposix.so util/signal.so @@ -42,7 +42,7 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin install -m644 certs/* $(CONFIG)/certs install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1 test -f $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua - test -f prosody.version && install -m644 prosody.version $(SOURCE)/prosody.version || true + -test -f prosody.version && install -m644 prosody.version $(SOURCE)/prosody.version $(MAKE) install -C util-src clean: @@ -65,8 +65,16 @@ util/%.so: prosody.cfg.lua.install: prosody.cfg.lua.dist sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' $^ > $@ -prosody.version: $(wildcard prosody.release .hg/dirstate) - test -f .hg/dirstate && \ - hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@ || true - test -f prosody.release && \ - cp prosody.release $@ || true +%.version: %.release + cp $^ $@ + +%.version: .hg_archival.txt + sed -n 's/^node: \(............\).*/\1/p' $^ > $@ + +%.version: .hg/dirstate + hexdump -n6 -e'6/1 "%02x"' $^ > $@ + +%.version: + echo unknown > $@ + + |