/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

  • Committer: Teddy Hogeborn
  • Date: 2008-09-04 07:30:58 UTC
  • mfrom: (24.1.87 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20080904073058-h21spydersnh8jml
* README: Improved wording.

Show diffs side-by-side

added added

removed removed

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