/mandos/trunk

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

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2009-10-30 16:23:43 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091030162343-1p2a8bf3gc084kc9
* plugins.d/password-prompt.c: Use environment variables and prompt
                               text from cryptsetup 1.1.
* plugins.d/password-prompt.xml (ENVIRONMENT): Document change in
                                               environment variables
                                               used.

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