/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-08-14 02:24:59 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080814022459-rq3jt4q409l3qbj3
* Makefile (PREFIX, CONFDIR): New.

* initramfs-tools-hook: Search for Mandos in /usr/local as well as in
                        /usr.  Also copy plugin-runner.  Also chmod
                        the config dir.
  (DESTCONFDIR): Removed.
  (MANDOSDIR): New.
  (PLUGINDIR): Changed to "${MANDOSDIR}/plugins.d".

* initramfs-tools-script: New.

* mandos-client.c: Renamed to "plugin-runner.c".  All references
                   changed.
  (plugindir): Changed to "/lib/mandos/plugins.d".

* plugins.d/usplash: New.

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