/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to Makefile

* Makefile (LINK_FORTIFY_LD): Bug fix: removed "-fPIE".
* mandos-keygen: Bug fix: Fix quoting for the "--password" option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
4
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
 
        -Wpacked -Wnested-externs -Wunreachable-code -Winline \
8
 
        -Wvolatile-register-var
9
 
DEBUG=-ggdb3
 
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
 
8
#       -Wunreachable-code 
 
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
 
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
12
 
FORTIFY=-D_FORTIFY_SOURCE=2 # -fstack-protector-all
 
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
 
12
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
13
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
 
14
LINK_FORTIFY_LD=-z relro -z now
 
15
LINK_FORTIFY=
 
16
 
 
17
# If BROKEN_PIE is set, do not build with -pie
 
18
ifndef BROKEN_PIE
 
19
FORTIFY += -fPIE
 
20
LINK_FORTIFY += -pie
 
21
endif
13
22
#COVERAGE=--coverage
14
23
OPTIMIZE=-Os
15
24
LANGUAGE=-std=gnu99
16
 
# PREFIX=/usr/local
 
25
htmldir=man
 
26
version=1.0.14
 
27
SED=sed
 
28
 
 
29
## Use these settings for a traditional /usr/local install
 
30
# PREFIX=$(DESTDIR)/usr/local
 
31
# CONFDIR=$(DESTDIR)/etc/mandos
 
32
# KEYDIR=$(DESTDIR)/etc/mandos/keys
 
33
# MANDIR=$(PREFIX)/man
 
34
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
35
##
 
36
 
 
37
## These settings are for a package-type install
17
38
PREFIX=$(DESTDIR)/usr
18
 
# CONFDIR=/usr/local/lib/mandos
19
39
CONFDIR=$(DESTDIR)/etc/mandos
20
 
# KEYDIR=/usr/local/lib/mandos/keys
21
40
KEYDIR=$(DESTDIR)/etc/keys/mandos
22
 
# MANDIR=/usr/local/man
23
 
MANDIR=$(DESTDIR)/usr/share/man
 
41
MANDIR=$(PREFIX)/share/man
 
42
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
43
##
24
44
 
25
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
26
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
45
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
46
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
27
47
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
28
48
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
29
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
30
 
GPGME_LIBS=$(shell gpgme-config --libs)
 
49
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
50
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
51
        getconf LFS_LDFLAGS)
31
52
 
32
53
# Do not change these two
33
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
34
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
35
 
LDFLAGS=$(COVERAGE)
 
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
 
56
        -DVERSION='"$(version)"'
 
57
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
36
58
 
37
 
# Commands to format a DocBook refentry document into a manual page
38
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
59
# Commands to format a DocBook <refentry> document into a manual page
 
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
39
61
        --param man.charmap.use.subset          0 \
40
62
        --param make.year.ranges                1 \
41
63
        --param make.single.year.ranges         1 \
43
65
        --param man.authors.section.enabled     0 \
44
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
45
67
        $(notdir $<); \
46
 
        $(MANPOST) $(notdir $@)
47
 
# DocBook-to-man post-processing to fix a \n escape bug
48
 
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
49
 
 
50
 
PLUGINS=plugins.d/password-prompt plugins.d/password-request
51
 
PROGS=plugin-runner $(PLUGINS)
 
68
        $(MANPOST) $(notdir $@))
 
69
# DocBook-to-man post-processing to fix a '\n' escape bug
 
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
71
 
 
72
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
73
        --param make.year.ranges                1 \
 
74
        --param make.single.year.ranges         1 \
 
75
        --param man.output.quietly              1 \
 
76
        --param man.authors.section.enabled     0 \
 
77
        --param citerefentry.link               1 \
 
78
        --output $@ \
 
79
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
 
80
        $<; $(HTMLPOST) $@)
 
81
# Fix citerefentry links
 
82
HTMLPOST=$(SED) --in-place \
 
83
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
 
84
 
 
85
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
 
86
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
 
87
CPROGS=plugin-runner $(PLUGINS)
 
88
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
52
89
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
53
 
        plugins.d/password-request.8mandos \
 
90
        plugins.d/mandos-client.8mandos \
54
91
        plugins.d/password-prompt.8mandos mandos.conf.5 \
55
 
        mandos-clients.conf.5
56
 
 
57
 
objects=$(addsuffix .o,$(PROGS))
58
 
 
59
 
all: $(PROGS)
 
92
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
93
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
94
 
 
95
htmldocs=$(addsuffix .xhtml,$(DOCS))
 
96
 
 
97
objects=$(addsuffix .o,$(CPROGS))
 
98
 
 
99
all: $(PROGS) mandos.lsm
60
100
 
61
101
doc: $(DOCS)
62
102
 
63
 
%.5: %.xml legalnotice.xml
64
 
        $(DOCBOOKTOMAN)
65
 
 
66
 
%.8: %.xml legalnotice.xml
67
 
        $(DOCBOOKTOMAN)
68
 
 
69
 
%.8mandos: %.xml legalnotice.xml
70
 
        $(DOCBOOKTOMAN)
71
 
 
72
 
mandos.8: mandos.xml mandos-options.xml overview.xml legalnotice.xml
73
 
        $(DOCBOOKTOMAN)
74
 
 
75
 
mandos-keygen.8: mandos-keygen.xml overview.xml legalnotice.xml
76
 
        $(DOCBOOKTOMAN)
77
 
 
78
 
mandos.conf.5: mandos.conf.xml mandos-options.xml legalnotice.xml
79
 
        $(DOCBOOKTOMAN)
80
 
 
81
 
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
82
 
        $(DOCBOOKTOMAN)
83
 
 
84
 
plugins.d/password-request.8mandos: plugins.d/password-request.xml \
85
 
                                        mandos-options.xml \
86
 
                                        overview.xml legalnotice.xml
87
 
        $(DOCBOOKTOMAN)
88
 
 
89
 
plugins.d/password-request: plugins.d/password-request.o
90
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
91
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
92
 
 
93
 
.PHONY : all doc clean distclean run-client run-server install \
 
103
html: $(htmldocs)
 
104
 
 
105
%.5: %.xml common.ent legalnotice.xml
 
106
        $(DOCBOOKTOMAN)
 
107
%.5.xhtml: %.xml common.ent legalnotice.xml
 
108
        $(DOCBOOKTOHTML)
 
109
 
 
110
%.8: %.xml common.ent legalnotice.xml
 
111
        $(DOCBOOKTOMAN)
 
112
%.8.xhtml: %.xml common.ent legalnotice.xml
 
113
        $(DOCBOOKTOHTML)
 
114
 
 
115
%.8mandos: %.xml common.ent legalnotice.xml
 
116
        $(DOCBOOKTOMAN)
 
117
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
 
118
        $(DOCBOOKTOHTML)
 
119
 
 
120
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
 
121
                legalnotice.xml
 
122
        $(DOCBOOKTOMAN)
 
123
mandos.8.xhtml: mandos.xml common.ent mandos-options.xml \
 
124
                overview.xml legalnotice.xml
 
125
        $(DOCBOOKTOHTML)
 
126
 
 
127
mandos-keygen.8: mandos-keygen.xml common.ent overview.xml \
 
128
                legalnotice.xml
 
129
        $(DOCBOOKTOMAN)
 
130
mandos-keygen.8.xhtml: mandos-keygen.xml common.ent overview.xml \
 
131
                 legalnotice.xml
 
132
        $(DOCBOOKTOHTML)
 
133
 
 
134
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
 
135
                legalnotice.xml
 
136
        $(DOCBOOKTOMAN)
 
137
mandos.conf.5.xhtml: mandos.conf.xml common.ent mandos-options.xml \
 
138
                legalnotice.xml
 
139
        $(DOCBOOKTOHTML)
 
140
 
 
141
plugin-runner.8mandos: plugin-runner.xml common.ent overview.xml \
 
142
                legalnotice.xml
 
143
        $(DOCBOOKTOMAN)
 
144
plugin-runner.8mandos.xhtml: plugin-runner.xml common.ent \
 
145
                overview.xml legalnotice.xml
 
146
        $(DOCBOOKTOHTML)
 
147
 
 
148
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
 
149
                                        common.ent \
 
150
                                        mandos-options.xml \
 
151
                                        overview.xml legalnotice.xml
 
152
        $(DOCBOOKTOMAN)
 
153
plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \
 
154
                                        common.ent \
 
155
                                        mandos-options.xml \
 
156
                                        overview.xml legalnotice.xml
 
157
        $(DOCBOOKTOHTML)
 
158
 
 
159
# Update all these files with version number $(version)
 
160
common.ent: Makefile
 
161
        $(strip $(SED) --in-place \
 
162
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
163
                $@)
 
164
 
 
165
mandos: Makefile
 
166
        $(strip $(SED) --in-place \
 
167
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
168
                $@)
 
169
 
 
170
mandos-keygen: Makefile
 
171
        $(strip $(SED) --in-place \
 
172
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
 
173
                $@)
 
174
 
 
175
mandos-ctl: Makefile
 
176
        $(strip $(SED) --in-place \
 
177
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
178
                $@)
 
179
 
 
180
mandos.lsm: Makefile
 
181
        $(strip $(SED) --in-place \
 
182
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
 
183
                $@)
 
184
        $(strip $(SED) --in-place \
 
185
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
 
186
                $@)
 
187
        $(strip $(SED) --in-place \
 
188
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
 
189
                $@)
 
190
 
 
191
plugins.d/mandos-client: plugins.d/mandos-client.c
 
192
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
 
193
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
194
 
 
195
.PHONY : all doc html clean distclean run-client run-server install \
94
196
        install-server install-client uninstall uninstall-server \
95
197
        uninstall-client purge purge-server purge-client
96
198
 
97
199
clean:
98
 
        -rm --force $(PROGS) $(objects) $(DOCS) core
 
200
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
99
201
 
100
202
distclean: clean
101
203
mostlyclean: clean
102
204
maintainer-clean: clean
103
205
        -rm --force --recursive keydir confdir
104
206
 
105
 
check:
 
207
check:  all
106
208
        ./mandos --check
107
209
 
108
210
# Run the client with a local config and key
109
211
run-client: all keydir/seckey.txt keydir/pubkey.txt
110
212
        ./plugin-runner --plugin-dir=plugins.d \
111
213
                --config-file=plugin-runner.conf \
112
 
                --options-for=password-request:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
214
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
215
                $(CLIENTARGS)
113
216
 
114
217
# Used by run-client
115
218
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
118
221
 
119
222
# Run the server with a local config
120
223
run-server: confdir/mandos.conf confdir/clients.conf
121
 
        ./mandos --debug --configdir=confdir
 
224
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
122
225
 
123
226
# Used by run-server
124
227
confdir/mandos.conf: mandos.conf
126
229
        install --mode=u=rw,go=r $^ $@
127
230
confdir/clients.conf: clients.conf keydir/seckey.txt
128
231
        install --directory confdir
129
 
        install --mode=u=rw,g=r $< $@
 
232
        install --mode=u=rw $< $@
130
233
# Add a client password
131
234
        ./mandos-keygen --dir keydir --password >> $@
132
235
 
133
 
install: install-server install-client
 
236
install: install-server install-client-nokey
 
237
 
 
238
install-html: html
 
239
        install --directory $(htmldir)
 
240
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
 
241
                $(htmldocs)
134
242
 
135
243
install-server: doc
136
 
        install --directory $(CONFDIR) $(MANDIR)/man5 \
137
 
                $(MANDIR)/man8
 
244
        install --directory $(CONFDIR)
138
245
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
139
246
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
140
247
                mandos.conf
141
 
        install --mode=u=rw,g=r --target-directory=$(CONFDIR) \
 
248
        install --mode=u=rw --target-directory=$(CONFDIR) \
142
249
                clients.conf
143
 
        install --mode=u=rwx,go=rx init.d-mandos /etc/init.d/mandos
144
 
        install --mode=u=rw,go=r default-mandos /etc/default/mandos
145
 
        update-rc.d mandos defaults
 
250
        install --mode=u=rwx,go=rx init.d-mandos \
 
251
                $(DESTDIR)/etc/init.d/mandos
 
252
        install --mode=u=rw,go=r default-mandos \
 
253
                $(DESTDIR)/etc/default/mandos
 
254
        if [ -z $(DESTDIR) ]; then \
 
255
                update-rc.d mandos defaults 25 15;\
 
256
        fi
146
257
        gzip --best --to-stdout mandos.8 \
147
258
                > $(MANDIR)/man8/mandos.8.gz
148
259
        gzip --best --to-stdout mandos.conf.5 \
150
261
        gzip --best --to-stdout mandos-clients.conf.5 \
151
262
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
152
263
 
153
 
install-client: all doc /usr/share/initramfs-tools/hooks/.
154
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
155
 
                $(MANDIR)/man8
156
 
        install --directory --mode=u=rwx $(KEYDIR)
157
 
        install --directory --mode=u=rwx \
 
264
install-client-nokey: all doc
 
265
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
266
        install --directory --mode=u=rwx $(KEYDIR) \
158
267
                $(PREFIX)/lib/mandos/plugins.d
159
 
        if [ "$(CONFDIR)/plugins.d" \
160
 
                        != "$(PREFIX)/lib/mandos/plugins.d" ]; then \
161
 
                        install --directory "$(CONFDIR)/plugins.d"; \
162
 
                fi
 
268
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
269
                install --mode=u=rwx \
 
270
                        --directory "$(CONFDIR)/plugins.d"; \
 
271
        fi
163
272
        install --mode=u=rwx,go=rx \
164
273
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
165
274
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
169
278
                plugins.d/password-prompt
170
279
        install --mode=u=rwxs,go=rx \
171
280
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
172
 
                plugins.d/password-request
173
 
        install --mode=u=rwx,go=rx \
 
281
                plugins.d/mandos-client
 
282
        install --mode=u=rwxs,go=rx \
174
283
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
175
284
                plugins.d/usplash
 
285
        install --mode=u=rwxs,go=rx \
 
286
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
287
                plugins.d/splashy
 
288
        install --mode=u=rwxs,go=rx \
 
289
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
290
                plugins.d/askpass-fifo
176
291
        install initramfs-tools-hook \
177
 
                /usr/share/initramfs-tools/hooks/mandos
178
 
        install initramfs-tools-hook-conf \
179
 
                /usr/share/initramfs-tools/conf-hooks.d/mandos
 
292
                $(INITRAMFSTOOLS)/hooks/mandos
 
293
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
294
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
180
295
        install initramfs-tools-script \
181
 
                /usr/share/initramfs-tools/scripts/local-top/mandos
 
296
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
182
297
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
183
298
        gzip --best --to-stdout mandos-keygen.8 \
184
299
                > $(MANDIR)/man8/mandos-keygen.8.gz
186
301
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
187
302
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
188
303
                > $(MANDIR)/man8/password-prompt.8mandos.gz
189
 
        gzip --best --to-stdout plugins.d/password-request.8mandos \
190
 
                > $(MANDIR)/man8/password-request.8mandos.gz
 
304
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
305
                > $(MANDIR)/man8/mandos-client.8mandos.gz
 
306
        gzip --best --to-stdout plugins.d/usplash.8mandos \
 
307
                > $(MANDIR)/man8/usplash.8mandos.gz
 
308
        gzip --best --to-stdout plugins.d/splashy.8mandos \
 
309
                > $(MANDIR)/man8/splashy.8mandos.gz
 
310
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
 
311
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
312
 
 
313
install-client: install-client-nokey
 
314
# Post-installation stuff
191
315
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
192
316
        update-initramfs -k all -u
193
317
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
206
330
# Refuse to uninstall client if /etc/crypttab is explicitly configured
207
331
# to use it.
208
332
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
209
 
                /etc/crypttab
 
333
                $(DESTDIR)/etc/crypttab
210
334
        -rm --force $(PREFIX)/sbin/mandos-keygen \
211
335
                $(PREFIX)/lib/mandos/plugin-runner \
212
336
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
213
 
                $(PREFIX)/lib/mandos/plugins.d/password-request \
214
 
                /usr/share/initramfs-tools/hooks/mandos \
215
 
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
 
337
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
338
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
339
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
340
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
341
                $(INITRAMFSTOOLS)/hooks/mandos \
 
342
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
 
343
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
216
344
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
217
345
                $(MANDIR)/man8/mandos-keygen.8.gz \
218
346
                $(MANDIR)/man8/password-prompt.8mandos.gz \
219
 
                $(MANDIR)/man8/password-request.8mandos.gz
 
347
                $(MANDIR)/man8/usplash.8mandos.gz \
 
348
                $(MANDIR)/man8/splashy.8mandos.gz \
 
349
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
 
350
                $(MANDIR)/man8/mandos-client.8mandos.gz
220
351
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
221
 
                 $(PREFIX)/lib/mandos $(CONFDIR)
 
352
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
222
353
        update-initramfs -k all -u
223
354
 
224
355
purge: purge-server purge-client
225
356
 
226
357
purge-server: uninstall-server
227
358
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
228
 
                /etc/default/mandos /etc/init.d/mandos
 
359
                $(DESTDIR)/etc/default/mandos \
 
360
                $(DESTDIR)/etc/init.d/mandos \
 
361
                $(DESTDIR)/var/run/mandos.pid
229
362
        -rmdir $(CONFDIR)
230
363
 
231
364
purge-client: uninstall-client