Software /
code /
prosody
Annotate
makefile @ 12553:cc0ec0277813 0.12
util.startup: Fix async waiting for last shutdown steps
Observed problem: When shutting down prosody would immediately exit
after waiting for s2s connections to close, skipping the last cleanup
events and reporting the exit reason and code.
This happens because prosody.main_thread is in a waiting state and
queuing startup.shutdown is dispatched trough the main loop via
nexttick, but since the main loop was no longer running at that point it
proceeded to the end of the prosody script and exited there.
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Tue, 14 Jun 2022 16:28:49 +0200 |
parent | 12313:469e4453ed01 |
child | 12465:4a087713cffe |
rev | line source |
---|---|
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
1 |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
2 include config.unix |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
3 |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
4 BIN = $(DESTDIR)$(PREFIX)/bin |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
5 CONFIG = $(DESTDIR)$(SYSCONFDIR) |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
6 MODULES = $(DESTDIR)$(LIBDIR)/prosody/modules |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
7 SOURCE = $(DESTDIR)$(LIBDIR)/prosody |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
8 DATA = $(DESTDIR)$(DATADIR) |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
9 MAN = $(DESTDIR)$(PREFIX)/share/man |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
10 |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
11 INSTALLEDSOURCE = $(LIBDIR)/prosody |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
12 INSTALLEDCONFIG = $(SYSCONFDIR) |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
13 INSTALLEDMODULES = $(LIBDIR)/prosody/modules |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
14 INSTALLEDDATA = $(DATADIR) |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
15 |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
16 INSTALL=install -p |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
17 INSTALL_DATA=$(INSTALL) -m644 |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
18 INSTALL_EXEC=$(INSTALL) -m755 |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
19 MKDIR=install -d |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
20 MKDIR_PRIVATE=$(MKDIR) -m750 |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
21 |
9682
814a9d89d2bd
makefile: Add lint target (to match GNUMakefile)
Matthew Wild <mwild1@gmail.com>
parents:
8593
diff
changeset
|
22 LUACHECK=luacheck |
9683
bf32f2282b18
makefile: Allow configuring path to busted (to match GNUMakefile)
Matthew Wild <mwild1@gmail.com>
parents:
9682
diff
changeset
|
23 BUSTED=busted |
9682
814a9d89d2bd
makefile: Add lint target (to match GNUMakefile)
Matthew Wild <mwild1@gmail.com>
parents:
8593
diff
changeset
|
24 |
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
25 .PHONY: all test clean install |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
26 |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
27 all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
28 $(MAKE) -C util-src install |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
29 .if $(EXCERTS) == "yes" |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
30 $(MAKE) -C certs localhost.crt example.com.crt |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
31 .endif |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
32 |
12313
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
33 install-etc: prosody.cfg.lua.install |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
34 $(MKDIR) $(CONFIG) |
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
35 $(MKDIR) $(CONFIG)/certs |
12313
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
36 test -f $(CONFIG)/prosody.cfg.lua || $(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
37 .if $(EXCERTS) == "yes" |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
38 $(INSTALL_DATA) certs/localhost.crt certs/localhost.key $(CONFIG)/certs |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
39 $(INSTALL_DATA) certs/example.com.crt certs/example.com.key $(CONFIG)/certs |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
40 .endif |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
41 |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
42 install-bin: prosody.install prosodyctl.install |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
43 $(MKDIR) $(BIN) |
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
44 $(INSTALL_EXEC) ./prosody.install $(BIN)/prosody |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
45 $(INSTALL_EXEC) ./prosodyctl.install $(BIN)/prosodyctl |
12313
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
46 |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
47 install-core: |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
48 $(MKDIR) $(SOURCE) |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
49 $(MKDIR) $(SOURCE)/core |
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
50 $(INSTALL_DATA) core/*.lua $(SOURCE)/core |
12313
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
51 |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
52 install-net: |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
53 $(MKDIR) $(SOURCE) |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
54 $(MKDIR) $(SOURCE)/net |
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
55 $(INSTALL_DATA) net/*.lua $(SOURCE)/net |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
56 $(MKDIR) $(SOURCE)/net/http $(SOURCE)/net/resolvers $(SOURCE)/net/websocket |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
57 $(INSTALL_DATA) net/http/*.lua $(SOURCE)/net/http |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
58 $(INSTALL_DATA) net/resolvers/*.lua $(SOURCE)/net/resolvers |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
59 $(INSTALL_DATA) net/websocket/*.lua $(SOURCE)/net/websocket |
12313
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
60 |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
61 install-util: util/encodings.so util/encodings.so util/pposix.so util/signal.so |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
62 $(MKDIR) $(SOURCE) |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
63 $(MKDIR) $(SOURCE)/util |
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
64 $(INSTALL_DATA) util/*.lua $(SOURCE)/util |
12313
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
65 $(MAKE) install -C util-src |
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
66 $(INSTALL_DATA) util/*.so $(SOURCE)/util |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
67 $(MKDIR) $(SOURCE)/util/sasl |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
68 $(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl |
10881
0abd38e4ff3c
GNUmakefile: Install util.human.*
Kim Alvefur <zash@zash.se>
parents:
10880
diff
changeset
|
69 $(MKDIR) $(SOURCE)/util/human |
0abd38e4ff3c
GNUmakefile: Install util.human.*
Kim Alvefur <zash@zash.se>
parents:
10880
diff
changeset
|
70 $(INSTALL_DATA) util/human/*.lua $(SOURCE)/util/human |
10882
1999bb052d49
GNUmakefile: Install the new util/prosodyctl/* too (thanks pascal.pascher)
Kim Alvefur <zash@zash.se>
parents:
10881
diff
changeset
|
71 $(MKDIR) $(SOURCE)/util/prosodyctl |
1999bb052d49
GNUmakefile: Install the new util/prosodyctl/* too (thanks pascal.pascher)
Kim Alvefur <zash@zash.se>
parents:
10881
diff
changeset
|
72 $(INSTALL_DATA) util/prosodyctl/*.lua $(SOURCE)/util/prosodyctl |
12313
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
73 |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
74 install-plugins: |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
75 $(MKDIR) $(MODULES) |
10880
324c50ea0f1d
makefile: Remove installation of mod_s2s dir
Kim Alvefur <zash@zash.se>
parents:
9683
diff
changeset
|
76 $(MKDIR) $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam |
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
77 $(INSTALL_DATA) plugins/*.lua $(MODULES) |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
78 $(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
79 $(INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
80 $(INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
81 $(INSTALL_DATA) plugins/mod_mam/*.lua $(MODULES)/mod_mam |
12313
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
82 |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
83 install-man: |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
84 $(MKDIR) $(MAN)/man1 |
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
85 $(INSTALL_DATA) man/prosodyctl.man $(MAN)/man1/prosodyctl.1 |
12313
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
86 |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
87 install-meta: |
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
88 -test -f prosody.version && $(INSTALL_DATA) prosody.version $(SOURCE)/prosody.version |
12313
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
89 |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
90 install-data: |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
91 $(MKDIR_PRIVATE) $(DATA) |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
92 |
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
93 install: install-util install-net install-core install-plugins install-bin install-etc install-man install-meta install-data |
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
94 |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
95 clean: |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
96 rm -f prosody.install |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
97 rm -f prosodyctl.install |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
98 rm -f prosody.cfg.lua.install |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
99 rm -f prosody.version |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
100 $(MAKE) clean -C util-src |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
101 |
9682
814a9d89d2bd
makefile: Add lint target (to match GNUMakefile)
Matthew Wild <mwild1@gmail.com>
parents:
8593
diff
changeset
|
102 lint: |
814a9d89d2bd
makefile: Add lint target (to match GNUMakefile)
Matthew Wild <mwild1@gmail.com>
parents:
8593
diff
changeset
|
103 $(LUACHECK) -q $$(HGPLAIN= hg files -I '**.lua') prosody prosodyctl |
814a9d89d2bd
makefile: Add lint target (to match GNUMakefile)
Matthew Wild <mwild1@gmail.com>
parents:
8593
diff
changeset
|
104 @echo $$(sed -n '/^\tlocal exclude_files/,/^}/p;' .luacheckrc | sed '1d;$d' | wc -l) files ignored |
814a9d89d2bd
makefile: Add lint target (to match GNUMakefile)
Matthew Wild <mwild1@gmail.com>
parents:
8593
diff
changeset
|
105 shellcheck configure |
814a9d89d2bd
makefile: Add lint target (to match GNUMakefile)
Matthew Wild <mwild1@gmail.com>
parents:
8593
diff
changeset
|
106 |
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
107 test: |
9683
bf32f2282b18
makefile: Allow configuring path to busted (to match GNUMakefile)
Matthew Wild <mwild1@gmail.com>
parents:
9682
diff
changeset
|
108 $(BUSTED) --lua=$(RUNWITH) |
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
109 |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
110 |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
111 prosody.install: prosody |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
112 sed "1s| lua$$| $(RUNWITH)|; \ |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
113 s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \ |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
114 s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|; \ |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
115 s|^CFG_DATADIR=.*;$$|CFG_DATADIR='$(INSTALLEDDATA)';|; \ |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
116 s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" < prosody > $@ |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
117 |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
118 prosodyctl.install: prosodyctl |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
119 sed "1s| lua$$| $(RUNWITH)|; \ |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
120 s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \ |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
121 s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|; \ |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
122 s|^CFG_DATADIR=.*;$$|CFG_DATADIR='$(INSTALLEDDATA)';|; \ |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
123 s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" < prosodyctl > $@ |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
124 |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
125 prosody.cfg.lua.install: prosody.cfg.lua.dist |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
126 sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > $@ |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
127 |
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
128 prosody.version: |
11748
88ba05494d17
makefile: fix prosody.version target
Lucas <lucas@sexy.is>
parents:
8593
diff
changeset
|
129 if [ -f prosody.release ]; then \ |
88ba05494d17
makefile: fix prosody.version target
Lucas <lucas@sexy.is>
parents:
8593
diff
changeset
|
130 cp prosody.release $@; \ |
88ba05494d17
makefile: fix prosody.version target
Lucas <lucas@sexy.is>
parents:
8593
diff
changeset
|
131 elif [ -f .hg_archival.txt ]; then \ |
88ba05494d17
makefile: fix prosody.version target
Lucas <lucas@sexy.is>
parents:
8593
diff
changeset
|
132 sed -n 's/^node: \(............\).*/\1/p' .hg_archival.txt > $@; \ |
88ba05494d17
makefile: fix prosody.version target
Lucas <lucas@sexy.is>
parents:
8593
diff
changeset
|
133 elif [ -f .hg/dirstate ]; then \ |
88ba05494d17
makefile: fix prosody.version target
Lucas <lucas@sexy.is>
parents:
8593
diff
changeset
|
134 hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@; \ |
88ba05494d17
makefile: fix prosody.version target
Lucas <lucas@sexy.is>
parents:
8593
diff
changeset
|
135 else \ |
88ba05494d17
makefile: fix prosody.version target
Lucas <lucas@sexy.is>
parents:
8593
diff
changeset
|
136 echo unknown > $@; \ |
88ba05494d17
makefile: fix prosody.version target
Lucas <lucas@sexy.is>
parents:
8593
diff
changeset
|
137 fi |