/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:27:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091030162717-dun2a9li8bu6jm2w
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
            mandos-keygen, mandos-ctl, mandos.lsm): Add $(strip) to
                                                    make commands
                                                    easier to read
                                                    when run.
           (plugins.d/mandos-client): Use $(LINK.c) to compile in the
                                      same way as the other programs -
                                      i.e. not via an object file.

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
 
# MANDIR=/usr/local/man
21
 
MANDIR=$(DESTDIR)/usr/share/man
 
39
KEYDIR=$(DESTDIR)/etc/keys/mandos
 
40
MANDIR=$(PREFIX)/share/man
 
41
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
42
##
22
43
 
23
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
24
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
44
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
45
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
25
46
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
26
47
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
27
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
28
 
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)
29
51
 
30
52
# Do not change these two
31
53
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
32
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
33
 
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))
34
57
 
35
 
# Commands to format a DocBook refentry document into a manual page
36
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
58
# Commands to format a DocBook <refentry> document into a manual page
 
59
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
37
60
        --param man.charmap.use.subset          0 \
38
61
        --param make.year.ranges                1 \
39
62
        --param make.single.year.ranges         1 \
41
64
        --param man.authors.section.enabled     0 \
42
65
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
43
66
        $(notdir $<); \
44
 
        $(MANPOST) $(notdir $@)
45
 
# DocBook-to-man post-processing to fix a \n escape bug
46
 
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
47
 
 
48
 
PLUGINS=plugins.d/password-prompt plugins.d/password-request
49
 
PROGS=plugin-runner $(PLUGINS)
 
67
        $(MANPOST) $(notdir $@))
 
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=$(strip 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)
50
88
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
51
 
        plugins.d/password-request.8mandos \
 
89
        plugins.d/mandos-client.8mandos \
52
90
        plugins.d/password-prompt.8mandos mandos.conf.5 \
53
 
        mandos-clients.conf.5
54
 
 
55
 
objects=$(addsuffix .o,$(PROGS))
56
 
 
57
 
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
58
99
 
59
100
doc: $(DOCS)
60
101
 
61
 
%.5: %.xml
62
 
        $(DOCBOOKTOMAN)
63
 
 
64
 
%.8: %.xml
65
 
        $(DOCBOOKTOMAN)
66
 
 
67
 
%.8mandos: %.xml
68
 
        $(DOCBOOKTOMAN)
69
 
 
70
 
mandos.8: mandos.xml mandos-options.xml
71
 
        $(DOCBOOKTOMAN)
72
 
 
73
 
mandos.conf.5: mandos.conf.xml mandos-options.xml
74
 
        $(DOCBOOKTOMAN)
75
 
 
76
 
plugins.d/password-request: plugins.d/password-request.o
77
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
78
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
79
 
 
80
 
.PHONY : all doc clean distclean run-client run-server install \
 
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
        $(strip $(SED) --in-place \
 
161
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
162
                $@)
 
163
 
 
164
mandos: Makefile
 
165
        $(strip $(SED) --in-place \
 
166
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
167
                $@)
 
168
 
 
169
mandos-keygen: Makefile
 
170
        $(strip $(SED) --in-place \
 
171
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
 
172
                $@)
 
173
 
 
174
mandos-ctl: Makefile
 
175
        $(strip $(SED) --in-place \
 
176
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
177
                $@)
 
178
 
 
179
mandos.lsm: Makefile
 
180
        $(strip $(SED) --in-place \
 
181
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
 
182
                $@)
 
183
        $(strip $(SED) --in-place \
 
184
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
 
185
                $@)
 
186
        $(strip $(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.c
 
191
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
 
192
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
193
 
 
194
.PHONY : all doc html clean distclean run-client run-server install \
81
195
        install-server install-client uninstall uninstall-server \
82
196
        uninstall-client purge purge-server purge-client
83
197
 
84
198
clean:
85
 
        -rm --force $(PROGS) $(objects) $(DOCS) core
 
199
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
86
200
 
87
201
distclean: clean
88
202
mostlyclean: clean
89
203
maintainer-clean: clean
90
204
        -rm --force --recursive keydir confdir
91
205
 
92
 
check:
 
206
check:  all
93
207
        ./mandos --check
94
208
 
95
 
# Run the server with a local key
96
 
run-client: all keydir/seckey.txt keydir/pubkey.txt \
97
 
        keydir/secring.gpg keydir/pubring.gpg
 
209
# Run the client with a local config and key
 
210
run-client: all keydir/seckey.txt keydir/pubkey.txt
98
211
        ./plugin-runner --plugin-dir=plugins.d \
99
 
                --options-for=password-request:--keydir=keydir
 
212
                --config-file=plugin-runner.conf \
 
213
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
214
                $(CLIENTARGS)
100
215
 
101
216
# Used by run-client
102
 
keydir/secring.gpg: keydir/seckey.txt
103
 
        gpg --homedir $(dir $<) --import $^
104
 
keydir/pubring.gpg: keydir/pubkey.txt
105
 
        gpg --homedir $(dir $<) --import $^
106
217
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
107
218
        install --directory keydir
108
219
        ./mandos-keygen --dir keydir --force
109
220
 
110
221
# Run the server with a local config
111
222
run-server: confdir/mandos.conf confdir/clients.conf
112
 
        ./mandos --debug --configdir=confdir
 
223
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
113
224
 
114
225
# Used by run-server
115
226
confdir/mandos.conf: mandos.conf
116
227
        install --directory confdir
117
 
        install $^ $@
 
228
        install --mode=u=rw,go=r $^ $@
118
229
confdir/clients.conf: clients.conf keydir/seckey.txt
119
230
        install --directory confdir
120
 
        install clients.conf $@
 
231
        install --mode=u=rw $< $@
121
232
# Add a client password
122
233
        ./mandos-keygen --dir keydir --password >> $@
123
234
 
124
 
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)
125
241
 
126
242
install-server: doc
127
 
        install --directory --parents $(CONFDIR) $(MANDIR)/man5 \
128
 
                $(MANDIR)/man8
129
 
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
130
 
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
131
 
        install --mode=0640 --target-directory=$(CONFDIR) \
 
243
        install --directory $(CONFDIR)
 
244
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
245
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
 
246
                mandos.conf
 
247
        install --mode=u=rw --target-directory=$(CONFDIR) \
132
248
                clients.conf
 
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
133
256
        gzip --best --to-stdout mandos.8 \
134
257
                > $(MANDIR)/man8/mandos.8.gz
135
258
        gzip --best --to-stdout mandos.conf.5 \
137
260
        gzip --best --to-stdout mandos-clients.conf.5 \
138
261
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
139
262
 
140
 
install-client: all doc /usr/share/initramfs-tools/hooks/.
141
 
        install --directory --parents $(PREFIX)/lib/mandos \
142
 
                $(CONFDIR) $(MANDIR)/man8
143
 
        install --directory --mode=0700 $(PREFIX)/lib/mandos/plugins.d
144
 
        chmod u=rwx,g=,o= $(PREFIX)/lib/mandos/plugins.d
145
 
        install --mode=0755 --target-directory=$(PREFIX)/lib/mandos \
146
 
                plugin-runner
147
 
        install --mode=0755 --target-directory=$(PREFIX)/sbin \
 
263
install-client-nokey: all doc
 
264
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
265
        install --directory --mode=u=rwx $(KEYDIR) \
 
266
                $(PREFIX)/lib/mandos/plugins.d
 
267
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
268
                install --mode=u=rwx \
 
269
                        --directory "$(CONFDIR)/plugins.d"; \
 
270
        fi
 
271
        install --mode=u=rwx,go=rx \
 
272
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
273
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
148
274
                mandos-keygen
149
 
        install --mode=0755 \
 
275
        install --mode=u=rwx,go=rx \
150
276
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
151
277
                plugins.d/password-prompt
152
 
        install --mode=4755 \
153
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
154
 
                plugins.d/password-request
 
278
        install --mode=u=rwxs,go=rx \
 
279
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
280
                plugins.d/mandos-client
 
281
        install --mode=u=rwxs,go=rx \
 
282
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
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
155
290
        install initramfs-tools-hook \
156
 
                /usr/share/initramfs-tools/hooks/mandos
157
 
        install initramfs-tools-hook-conf \
158
 
                /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
159
294
        install initramfs-tools-script \
160
 
                /usr/share/initramfs-tools/scripts/local-top/mandos
 
295
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
296
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
161
297
        gzip --best --to-stdout mandos-keygen.8 \
162
298
                > $(MANDIR)/man8/mandos-keygen.8.gz
163
299
        gzip --best --to-stdout plugin-runner.8mandos \
164
300
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
165
301
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
166
302
                > $(MANDIR)/man8/password-prompt.8mandos.gz
167
 
        gzip --best --to-stdout plugins.d/password-request.8mandos \
168
 
                > $(MANDIR)/man8/password-request.8mandos.gz
169
 
        -$(PREFIX)/sbin/mandos-keygen
 
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
 
314
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
170
315
        update-initramfs -k all -u
 
316
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
171
317
 
172
318
uninstall: uninstall-server uninstall-client
173
319
 
174
 
uninstall-server: $(PREFIX)/sbin/mandos
 
320
uninstall-server:
175
321
        -rm --force $(PREFIX)/sbin/mandos \
176
322
                $(MANDIR)/man8/mandos.8.gz \
177
323
                $(MANDIR)/man5/mandos.conf.5.gz \
178
324
                $(MANDIR)/man5/mandos-clients.conf.5.gz
 
325
        update-rc.d -f mandos remove
179
326
        -rmdir $(CONFDIR)
180
327
 
181
328
uninstall-client:
182
329
# Refuse to uninstall client if /etc/crypttab is explicitly configured
183
330
# to use it.
184
331
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
185
 
                /etc/crypttab
 
332
                $(DESTDIR)/etc/crypttab
186
333
        -rm --force $(PREFIX)/sbin/mandos-keygen \
187
334
                $(PREFIX)/lib/mandos/plugin-runner \
188
335
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
189
 
                $(PREFIX)/lib/mandos/plugins.d/password-request \
190
 
                /usr/share/initramfs-tools/hooks/mandos \
191
 
                /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 \
192
343
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
193
344
                $(MANDIR)/man8/mandos-keygen.8.gz \
194
345
                $(MANDIR)/man8/password-prompt.8mandos.gz \
195
 
                $(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
196
350
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
197
 
                 $(PREFIX)/lib/mandos $(CONFDIR)
 
351
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
198
352
        update-initramfs -k all -u
199
353
 
200
354
purge: purge-server purge-client
201
355
 
202
356
purge-server: uninstall-server
203
 
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf
 
357
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
358
                $(DESTDIR)/etc/default/mandos \
 
359
                $(DESTDIR)/etc/init.d/mandos \
 
360
                $(DESTDIR)/var/run/mandos.pid
204
361
        -rmdir $(CONFDIR)
205
362
 
206
363
purge-client: uninstall-client
207
 
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
208
 
        -rmdir $(CONFDIR) $(CONFDIR)/plugins.d
 
364
        -shred --remove $(KEYDIR)/seckey.txt
 
365
        -rm --force $(CONFDIR)/plugin-runner.conf \
 
366
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
 
367
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)