Software / code / prosody
Annotate
makefile @ 13792:4ea7bd7325be 13.0
core.portmanager: Restore use of per-host 'ssl' for SNI hosts. Fixes #1915.
This was an unintentional regression, as per-host 'ssl' options became valid
in 0.12 when SNI support was added for direct TLS ports. While we encourage
most people to use the simpler automatic certificate selection (and it seems
most do, given the overlooking of this bug), there are likely always going to
be use cases for manually-configured certificates.
The issue was introduced in commit 7e9ebdc75ce4 which inadvertently removed
the per-host option checking for SNI.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 29 Mar 2025 22:25:19 +0100 |
| parent | 12947:14a44b1a51d0 |
| 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 |
|
12947
14a44b1a51d0
prosody.loader: Allow loading modules under 'prosody' namespace (#1223)
Kim Alvefur <zash@zash.se>
parents:
12465
diff
changeset
|
47 install-loader: |
|
14a44b1a51d0
prosody.loader: Allow loading modules under 'prosody' namespace (#1223)
Kim Alvefur <zash@zash.se>
parents:
12465
diff
changeset
|
48 $(MKDIR) $(SOURCE) |
|
14a44b1a51d0
prosody.loader: Allow loading modules under 'prosody' namespace (#1223)
Kim Alvefur <zash@zash.se>
parents:
12465
diff
changeset
|
49 $(INSTALL_DATA) loader.lua $(SOURCE) |
|
14a44b1a51d0
prosody.loader: Allow loading modules under 'prosody' namespace (#1223)
Kim Alvefur <zash@zash.se>
parents:
12465
diff
changeset
|
50 |
|
12313
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
51 install-core: |
|
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
52 $(MKDIR) $(SOURCE) |
|
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
53 $(MKDIR) $(SOURCE)/core |
|
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
54 $(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
|
55 |
|
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
56 install-net: |
|
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
57 $(MKDIR) $(SOURCE) |
|
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
58 $(MKDIR) $(SOURCE)/net |
|
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
59 $(INSTALL_DATA) net/*.lua $(SOURCE)/net |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
60 $(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
|
61 $(INSTALL_DATA) net/http/*.lua $(SOURCE)/net/http |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
62 $(INSTALL_DATA) net/resolvers/*.lua $(SOURCE)/net/resolvers |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
63 $(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
|
64 |
|
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
65 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
|
66 $(MKDIR) $(SOURCE) |
|
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
67 $(MKDIR) $(SOURCE)/util |
|
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
68 $(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
|
69 $(MAKE) install -C util-src |
|
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
70 $(INSTALL_DATA) util/*.so $(SOURCE)/util |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
71 $(MKDIR) $(SOURCE)/util/sasl |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
72 $(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl |
|
10881
0abd38e4ff3c
GNUmakefile: Install util.human.*
Kim Alvefur <zash@zash.se>
parents:
10880
diff
changeset
|
73 $(MKDIR) $(SOURCE)/util/human |
|
0abd38e4ff3c
GNUmakefile: Install util.human.*
Kim Alvefur <zash@zash.se>
parents:
10880
diff
changeset
|
74 $(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
|
75 $(MKDIR) $(SOURCE)/util/prosodyctl |
|
1999bb052d49
GNUmakefile: Install the new util/prosodyctl/* too (thanks pascal.pascher)
Kim Alvefur <zash@zash.se>
parents:
10881
diff
changeset
|
76 $(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
|
77 |
|
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
78 install-plugins: |
|
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
79 $(MKDIR) $(MODULES) |
|
12465
4a087713cffe
make: Install stanza watcher library (thanks Menel)
Kim Alvefur <zash@zash.se>
parents:
12313
diff
changeset
|
80 $(MKDIR) $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam $(MODULES)/mod_debug_stanzas |
|
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
81 $(INSTALL_DATA) plugins/*.lua $(MODULES) |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
82 $(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
83 $(INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
84 $(INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
85 $(INSTALL_DATA) plugins/mod_mam/*.lua $(MODULES)/mod_mam |
|
12465
4a087713cffe
make: Install stanza watcher library (thanks Menel)
Kim Alvefur <zash@zash.se>
parents:
12313
diff
changeset
|
86 $(INSTALL_DATA) plugins/mod_debug_stanzas/*.lua $(MODULES)/mod_debug_stanzas |
|
12313
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
87 |
|
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
88 install-man: |
|
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
89 $(MKDIR) $(MAN)/man1 |
|
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
90 $(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
|
91 |
|
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
92 install-meta: |
|
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
93 -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
|
94 |
|
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
95 install-data: |
|
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
96 $(MKDIR_PRIVATE) $(DATA) |
|
469e4453ed01
make: Split up install targets to allow different subset
Kim Alvefur <zash@zash.se>
parents:
11750
diff
changeset
|
97 |
|
12947
14a44b1a51d0
prosody.loader: Allow loading modules under 'prosody' namespace (#1223)
Kim Alvefur <zash@zash.se>
parents:
12465
diff
changeset
|
98 install: install-util install-net install-core install-plugins install-bin install-etc install-man install-meta install-data install-loader |
|
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
99 |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
100 clean: |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
101 rm -f prosody.install |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
102 rm -f prosodyctl.install |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
103 rm -f prosody.cfg.lua.install |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
104 rm -f prosody.version |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
105 $(MAKE) clean -C util-src |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
106 |
|
9682
814a9d89d2bd
makefile: Add lint target (to match GNUMakefile)
Matthew Wild <mwild1@gmail.com>
parents:
8593
diff
changeset
|
107 lint: |
|
814a9d89d2bd
makefile: Add lint target (to match GNUMakefile)
Matthew Wild <mwild1@gmail.com>
parents:
8593
diff
changeset
|
108 $(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
|
109 @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
|
110 shellcheck configure |
|
814a9d89d2bd
makefile: Add lint target (to match GNUMakefile)
Matthew Wild <mwild1@gmail.com>
parents:
8593
diff
changeset
|
111 |
|
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
112 test: |
|
9683
bf32f2282b18
makefile: Allow configuring path to busted (to match GNUMakefile)
Matthew Wild <mwild1@gmail.com>
parents:
9682
diff
changeset
|
113 $(BUSTED) --lua=$(RUNWITH) |
|
8593
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
114 |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
115 |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
116 prosody.install: prosody |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
117 sed "1s| lua$$| $(RUNWITH)|; \ |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
118 s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \ |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
119 s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|; \ |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
120 s|^CFG_DATADIR=.*;$$|CFG_DATADIR='$(INSTALLEDDATA)';|; \ |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
121 s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" < prosody > $@ |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
122 |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
123 prosodyctl.install: prosodyctl |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
124 sed "1s| lua$$| $(RUNWITH)|; \ |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
125 s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \ |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
126 s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|; \ |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
127 s|^CFG_DATADIR=.*;$$|CFG_DATADIR='$(INSTALLEDDATA)';|; \ |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
128 s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" < prosodyctl > $@ |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
129 |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
130 prosody.cfg.lua.install: prosody.cfg.lua.dist |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
131 sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > $@ |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
132 |
|
c4222e36333c
Add makefiles compatible with BSD make
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
133 prosody.version: |
|
11748
88ba05494d17
makefile: fix prosody.version target
Lucas <lucas@sexy.is>
parents:
8593
diff
changeset
|
134 if [ -f prosody.release ]; then \ |
|
88ba05494d17
makefile: fix prosody.version target
Lucas <lucas@sexy.is>
parents:
8593
diff
changeset
|
135 cp prosody.release $@; \ |
|
88ba05494d17
makefile: fix prosody.version target
Lucas <lucas@sexy.is>
parents:
8593
diff
changeset
|
136 elif [ -f .hg_archival.txt ]; then \ |
|
88ba05494d17
makefile: fix prosody.version target
Lucas <lucas@sexy.is>
parents:
8593
diff
changeset
|
137 sed -n 's/^node: \(............\).*/\1/p' .hg_archival.txt > $@; \ |
|
88ba05494d17
makefile: fix prosody.version target
Lucas <lucas@sexy.is>
parents:
8593
diff
changeset
|
138 elif [ -f .hg/dirstate ]; then \ |
|
88ba05494d17
makefile: fix prosody.version target
Lucas <lucas@sexy.is>
parents:
8593
diff
changeset
|
139 hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@; \ |
|
88ba05494d17
makefile: fix prosody.version target
Lucas <lucas@sexy.is>
parents:
8593
diff
changeset
|
140 else \ |
|
88ba05494d17
makefile: fix prosody.version target
Lucas <lucas@sexy.is>
parents:
8593
diff
changeset
|
141 echo unknown > $@; \ |
|
88ba05494d17
makefile: fix prosody.version target
Lucas <lucas@sexy.is>
parents:
8593
diff
changeset
|
142 fi |