/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

* mandos (Client.timeout, Client.interval): Changed from being a
                                            property to be a normal
                                            attribute.
  (Client._timeout, Client._interval): Removed.
  (Client._timeout_milliseconds): Changed from being an attribute to
                                  be a method "timeout_milliseconds".
                                  All users changed.
  (Client._interval_milliseconds): Changed from being an attribute to
                                   be method "interval_milliseconds".
                                   All users changed.
  (Client.__init__): Take additional "use_dbus" keyword argument.
                     Only provide D-Bus interface if "use_dbus" is
                     True.
  (Client.use_dbus): New attribute.
  (Client.dbus_object_path): Changed to only be set if "self.use_dbus"
                             is True.
  (Client.enable, Client.disable, Client.checker_callback,
  Client.bump_timeout, Client.start_checker, Client.stop_checker):
  Only emit D-Bus signals if "self.use_dbus".
  (Client.SetChecker, Client.SetHost, Client.Enable): Bug fix: Emit
                                                      D-Bus signals.
  (Client.SetInterval, Client.SetTimeout): Changed to emit D-Bus
                                           signals.

  (main): Remove deprecated "default" keyword argument to "--check"
          option.  Added new "--no-dbus" option.  Added corresponding
          "use_dbus" server configuration option.  Only provide D-Bus
          interface and emit D-Bus signals if "use_dbus".  Pass
          "use_dbus" on to Client constructor.

* mandos-options.xml ([@id="dbus"]): New option.

* mandos.conf (use_dbus): New option.

* mandos.conf.xml (OPTIONS): New option "use_dbus".
  (EXAMPLE): - '' -

* mandos.xml (SYNOPSIS): New option "--no-dbus".
  (D-BUS INTERFACE): New section.

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=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=2 -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
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code
 
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
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
 
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
22
14
#COVERAGE=--coverage
23
15
OPTIMIZE=-Os
24
16
LANGUAGE=-std=gnu99
25
17
htmldir=man
26
 
version=1.6.1
 
18
version=1.0.2
27
19
SED=sed
28
20
 
29
 
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
30
 
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
31
 
 
32
21
## Use these settings for a traditional /usr/local install
33
22
# PREFIX=$(DESTDIR)/usr/local
34
23
# CONFDIR=$(DESTDIR)/etc/mandos
35
24
# KEYDIR=$(DESTDIR)/etc/mandos/keys
36
25
# MANDIR=$(PREFIX)/man
37
26
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
39
27
##
40
28
 
41
29
## These settings are for a package-type install
44
32
KEYDIR=$(DESTDIR)/etc/keys/mandos
45
33
MANDIR=$(PREFIX)/share/man
46
34
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
 
STATEDIR=$(DESTDIR)/var/lib/mandos
48
35
##
49
36
 
50
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
51
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
37
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
38
GNUTLS_LIBS=$(shell libgnutls-config --libs)
52
39
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
53
40
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
54
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
55
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
56
 
        getconf LFS_LDFLAGS)
 
41
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
42
GPGME_LIBS=$(shell gpgme-config --libs)
57
43
 
58
44
# Do not change these two
59
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
45
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
60
46
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
61
47
        -DVERSION='"$(version)"'
62
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
48
LDFLAGS=$(COVERAGE) $(foreach flag,$(LINK_FORTIFY),-Xlinker $(flag))
63
49
 
64
50
# Commands to format a DocBook <refentry> document into a manual page
65
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
51
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
66
52
        --param man.charmap.use.subset          0 \
67
53
        --param make.year.ranges                1 \
68
54
        --param make.single.year.ranges         1 \
69
55
        --param man.output.quietly              1 \
70
56
        --param man.authors.section.enabled     0 \
71
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
57
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
58
        $(notdir $<); \
73
 
        $(MANPOST) $(notdir $@);\
74
 
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
75
 
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
76
 
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
77
 
        fi >/dev/null)
 
59
        $(MANPOST) $(notdir $@)
78
60
# DocBook-to-man post-processing to fix a '\n' escape bug
79
61
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
80
62
 
81
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
63
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
82
64
        --param make.year.ranges                1 \
83
65
        --param make.single.year.ranges         1 \
84
66
        --param man.output.quietly              1 \
86
68
        --param citerefentry.link               1 \
87
69
        --output $@ \
88
70
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
89
 
        $<; $(HTMLPOST) $@)
 
71
        $<; $(HTMLPOST) $@
90
72
# Fix citerefentry links
91
73
HTMLPOST=$(SED) --in-place \
92
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'
93
75
 
94
76
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
95
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
96
 
        plugins.d/plymouth
 
77
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
97
78
CPROGS=plugin-runner $(PLUGINS)
98
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
99
 
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
100
 
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
 
79
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
 
80
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
101
81
        plugins.d/mandos-client.8mandos \
102
 
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
103
 
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
104
 
        plugins.d/plymouth.8mandos intro.8mandos
 
82
        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
105
85
 
106
86
htmldocs=$(addsuffix .xhtml,$(DOCS))
107
87
 
128
108
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
129
109
        $(DOCBOOKTOHTML)
130
110
 
131
 
intro.8mandos: intro.xml common.ent legalnotice.xml
132
 
        $(DOCBOOKTOMAN)
133
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
134
 
        $(DOCBOOKTOHTML)
135
 
 
136
111
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
137
112
                legalnotice.xml
138
113
        $(DOCBOOKTOMAN)
147
122
                 legalnotice.xml
148
123
        $(DOCBOOKTOHTML)
149
124
 
150
 
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
151
 
                legalnotice.xml
152
 
        $(DOCBOOKTOMAN)
153
 
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
154
 
                 legalnotice.xml
155
 
        $(DOCBOOKTOHTML)
156
 
 
157
 
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
158
 
                legalnotice.xml
159
 
        $(DOCBOOKTOMAN)
160
 
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
161
 
                 legalnotice.xml
162
 
        $(DOCBOOKTOHTML)
163
 
 
164
125
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
165
126
                legalnotice.xml
166
127
        $(DOCBOOKTOMAN)
188
149
 
189
150
# Update all these files with version number $(version)
190
151
common.ent: Makefile
191
 
        $(strip $(SED) --in-place \
192
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
193
 
                $@)
 
152
        $(SED) --in-place \
 
153
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
154
                $@
194
155
 
195
156
mandos: Makefile
196
 
        $(strip $(SED) --in-place \
 
157
        $(SED) --in-place \
197
158
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
198
 
                $@)
 
159
                $@
199
160
 
200
161
mandos-keygen: Makefile
201
 
        $(strip $(SED) --in-place \
 
162
        $(SED) --in-place \
202
163
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
203
 
                $@)
204
 
 
205
 
mandos-ctl: Makefile
206
 
        $(strip $(SED) --in-place \
207
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
208
 
                $@)
209
 
 
210
 
mandos-monitor: Makefile
211
 
        $(strip $(SED) --in-place \
212
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
213
 
                $@)
 
164
                $@
 
165
 
 
166
mandos-list: Makefile
 
167
        $(SED) --in-place \
 
168
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
169
                $@
214
170
 
215
171
mandos.lsm: Makefile
216
 
        $(strip $(SED) --in-place \
 
172
        $(SED) --in-place \
217
173
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
218
 
                $@)
219
 
        $(strip $(SED) --in-place \
 
174
                $@
 
175
        $(SED) --in-place \
220
176
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
221
 
                $@)
222
 
        $(strip $(SED) --in-place \
223
 
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
224
 
                $@)
 
177
                $@
225
178
 
226
 
plugins.d/mandos-client: plugins.d/mandos-client.c
227
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
228
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
179
plugins.d/mandos-client: plugins.d/mandos-client.o
 
180
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
181
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
229
182
 
230
183
.PHONY : all doc html clean distclean run-client run-server install \
231
184
        install-server install-client uninstall uninstall-server \
237
190
distclean: clean
238
191
mostlyclean: clean
239
192
maintainer-clean: clean
240
 
        -rm --force --recursive keydir confdir statedir
 
193
        -rm --force --recursive keydir confdir
241
194
 
242
195
check:  all
243
196
        ./mandos --check
244
 
        ./mandos-ctl --check
245
197
 
246
198
# Run the client with a local config and key
247
199
run-client: all keydir/seckey.txt keydir/pubkey.txt
248
 
        @echo "###################################################################"
249
 
        @echo "# The following error messages are harmless and can be safely     #"
250
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
251
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
252
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
253
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
254
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
255
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
256
 
        @echo "#                     seteuid: Operation not permitted            #"
257
 
        @echo "#                     klogctl: Operation not permitted            #"
258
 
        @echo "###################################################################"
259
200
        ./plugin-runner --plugin-dir=plugins.d \
260
201
                --config-file=plugin-runner.conf \
261
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
262
 
                $(CLIENTARGS)
 
202
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
263
203
 
264
204
# Used by run-client
265
205
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
267
207
        ./mandos-keygen --dir keydir --force
268
208
 
269
209
# Run the server with a local config
270
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
271
 
        ./mandos --debug --no-dbus --configdir=confdir \
272
 
                --statedir=statedir $(SERVERARGS)
 
210
run-server: confdir/mandos.conf confdir/clients.conf
 
211
        ./mandos --debug --configdir=confdir
273
212
 
274
213
# Used by run-server
275
214
confdir/mandos.conf: mandos.conf
280
219
        install --mode=u=rw $< $@
281
220
# Add a client password
282
221
        ./mandos-keygen --dir keydir --password >> $@
283
 
statedir:
284
 
        install --directory statedir
285
222
 
286
223
install: install-server install-client-nokey
287
224
 
292
229
 
293
230
install-server: doc
294
231
        install --directory $(CONFDIR)
295
 
        install --directory --mode=u=rwx --owner=$(USER) \
296
 
                --group=$(GROUP) $(STATEDIR)
297
232
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
298
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
299
 
                mandos-ctl
300
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
301
 
                mandos-monitor
302
233
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
303
234
                mandos.conf
304
235
        install --mode=u=rw --target-directory=$(CONFDIR) \
305
236
                clients.conf
306
 
        install --mode=u=rw,go=r dbus-mandos.conf \
307
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
308
237
        install --mode=u=rwx,go=rx init.d-mandos \
309
238
                $(DESTDIR)/etc/init.d/mandos
310
239
        install --mode=u=rw,go=r default-mandos \
314
243
        fi
315
244
        gzip --best --to-stdout mandos.8 \
316
245
                > $(MANDIR)/man8/mandos.8.gz
317
 
        gzip --best --to-stdout mandos-monitor.8 \
318
 
                > $(MANDIR)/man8/mandos-monitor.8.gz
319
 
        gzip --best --to-stdout mandos-ctl.8 \
320
 
                > $(MANDIR)/man8/mandos-ctl.8.gz
321
246
        gzip --best --to-stdout mandos.conf.5 \
322
247
                > $(MANDIR)/man5/mandos.conf.5.gz
323
248
        gzip --best --to-stdout mandos-clients.conf.5 \
324
249
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
325
 
        gzip --best --to-stdout intro.8mandos \
326
 
                > $(MANDIR)/man8/intro.8mandos.gz
327
250
 
328
251
install-client-nokey: all doc
329
252
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
333
256
                install --mode=u=rwx \
334
257
                        --directory "$(CONFDIR)/plugins.d"; \
335
258
        fi
336
 
        install --mode=u=rwx,go=rx --directory \
337
 
                "$(CONFDIR)/network-hooks.d"
338
259
        install --mode=u=rwx,go=rx \
339
260
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
340
261
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
341
262
                mandos-keygen
342
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
343
 
                mandos-change-keytype
344
263
        install --mode=u=rwx,go=rx \
345
264
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
346
265
                plugins.d/password-prompt
356
275
        install --mode=u=rwxs,go=rx \
357
276
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
358
277
                plugins.d/askpass-fifo
359
 
        install --mode=u=rwxs,go=rx \
360
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
361
 
                plugins.d/plymouth
362
278
        install initramfs-tools-hook \
363
279
                $(INITRAMFSTOOLS)/hooks/mandos
364
280
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
365
281
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
366
282
        install initramfs-tools-script \
367
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
283
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
368
284
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
369
285
        gzip --best --to-stdout mandos-keygen.8 \
370
286
                > $(MANDIR)/man8/mandos-keygen.8.gz
371
287
        gzip --best --to-stdout plugin-runner.8mandos \
372
288
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
289
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
290
                > $(MANDIR)/man8/password-prompt.8mandos.gz
373
291
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
374
292
                > $(MANDIR)/man8/mandos-client.8mandos.gz
375
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
376
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
377
293
        gzip --best --to-stdout plugins.d/usplash.8mandos \
378
294
                > $(MANDIR)/man8/usplash.8mandos.gz
379
295
        gzip --best --to-stdout plugins.d/splashy.8mandos \
380
296
                > $(MANDIR)/man8/splashy.8mandos.gz
381
297
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
382
298
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
383
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
384
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
385
299
 
386
300
install-client: install-client-nokey
387
301
# Post-installation stuff
393
307
 
394
308
uninstall-server:
395
309
        -rm --force $(PREFIX)/sbin/mandos \
396
 
                $(PREFIX)/sbin/mandos-ctl \
397
 
                $(PREFIX)/sbin/mandos-monitor \
398
310
                $(MANDIR)/man8/mandos.8.gz \
399
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
400
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
401
311
                $(MANDIR)/man5/mandos.conf.5.gz \
402
312
                $(MANDIR)/man5/mandos-clients.conf.5.gz
403
313
        update-rc.d -f mandos remove
409
319
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
410
320
                $(DESTDIR)/etc/crypttab
411
321
        -rm --force $(PREFIX)/sbin/mandos-keygen \
412
 
                $(PREFIX)/sbin/mandos-change-keytype \
413
322
                $(PREFIX)/lib/mandos/plugin-runner \
414
323
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
415
324
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
416
325
                $(PREFIX)/lib/mandos/plugins.d/usplash \
417
326
                $(PREFIX)/lib/mandos/plugins.d/splashy \
418
327
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
419
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
420
328
                $(INITRAMFSTOOLS)/hooks/mandos \
421
329
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
422
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
330
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
331
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
423
332
                $(MANDIR)/man8/mandos-keygen.8.gz \
424
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
425
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
426
333
                $(MANDIR)/man8/password-prompt.8mandos.gz \
427
334
                $(MANDIR)/man8/usplash.8mandos.gz \
428
335
                $(MANDIR)/man8/splashy.8mandos.gz \
429
336
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
430
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
337
                $(MANDIR)/man8/mandos-client.8mandos.gz
431
338
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
432
339
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
433
340
        update-initramfs -k all -u
436
343
 
437
344
purge-server: uninstall-server
438
345
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
439
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
440
346
                $(DESTDIR)/etc/default/mandos \
441
347
                $(DESTDIR)/etc/init.d/mandos \
442
 
                $(DESTDIR)/run/mandos.pid
 
348
                $(DESTDIR)/var/run/mandos.pid
443
349
        -rmdir $(CONFDIR)
444
350
 
445
351
purge-client: uninstall-client