/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: 2008-12-10 01:26:02 UTC
  • mfrom: (237.1.2 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20081210012602-vhz3h75xkj24t340
First version of a somewhat complete D-Bus server interface.  Also
change user/group name to "_mandos".

* debian/mandos.postinst: Rename old "mandos" user and group to
                          "_mandos"; create "_mandos" user and group
                          if none exist.
* debian/mandos-client.postinst: - '' -

* initramfs-tools-hook: Try "_mandos" before "mandos" as user and
                        group name.

* mandos (_datetime_to_dbus_struct): New; was previously local.
  (Client.started): Renamed to "last_started".  All users changed.
  (Client.started): New; boolean.
  (Client.dbus_object_path): New.
  (Client.check_command): Renamed to "checker_command".  All users
                          changed.
  (Client.__init__): Set and use "self.dbus_object_path".  Set
                     "self.started".
  (Client.start): Update "self.started".  Emit "self.PropertyChanged"
                  signals for both "started" and "last_started".
  (Client.stop): Update "self.started".  Emit "self.PropertyChanged"
                 signal for "started".
  (Client.checker_callback): Take additional "command" argument.  All
                             callers changed. Emit
                             "self.PropertyChanged" signal.
  (Client.bump_timeout): Emit "self.PropertyChanged" signal for
                         "last_checked_ok".
  (Client.start_checker): Emit "self.PropertyChanged" signal for
                          "checker_running".
  (Client.stop_checker): Emit "self.PropertyChanged" signal for
                         "checker_running".
  (Client.still_valid): Bug fix: use "getattr(self, started, False)"
                        instead of "self.started" in case this client
                        object is so new that the "started" attribute
                        has not been created yet.
  (Client.IntervalChanged, Client.CheckerIsRunning, Client.GetChecker,
  Client.GetCreated, Client.GetFingerprint, Client.GetHost,
  Client.GetInterval, Client.GetName, Client.GetStarted,
  Client.GetTimeout, Client.StateChanged, Client.TimeoutChanged):
  Removed; all callers changed.
  (Client.CheckerCompleted): Add "condition" and "command" arguments.
                             All callers changed.
  (Client.GetAllProperties, Client.PropertyChanged): New.
  (Client.StillValid): Renamed to "IsStillValid".
  (Client.StartChecker): Changed to its own function to avoid the
                         return value from "Client.start_checker()".
  (Client.Stop): Changed to its own function to avoid the return value
                 from "Client.stop()".
  (main): Try "_mandos" before "mandos" as user and group name.
          Removed inner function "remove_from_clients".  New inner
          class "MandosServer".

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.2
 
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) $(LINK_FORTIFY)
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 $(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
                $@
214
165
 
215
166
mandos.lsm: Makefile
216
 
        $(strip $(SED) --in-place \
 
167
        $(SED) --in-place \
217
168
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
218
 
                $@)
219
 
        $(strip $(SED) --in-place \
 
169
                $@
 
170
        $(SED) --in-place \
220
171
                --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
 
                $@)
 
172
                $@
225
173
 
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 $@
 
174
plugins.d/mandos-client: plugins.d/mandos-client.o
 
175
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
176
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
229
177
 
230
178
.PHONY : all doc html clean distclean run-client run-server install \
231
179
        install-server install-client uninstall uninstall-server \
237
185
distclean: clean
238
186
mostlyclean: clean
239
187
maintainer-clean: clean
240
 
        -rm --force --recursive keydir confdir statedir
 
188
        -rm --force --recursive keydir confdir
241
189
 
242
190
check:  all
243
191
        ./mandos --check
244
 
        ./mandos-ctl --check
245
192
 
246
193
# Run the client with a local config and key
247
194
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
195
        ./plugin-runner --plugin-dir=plugins.d \
260
196
                --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)
 
197
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
263
198
 
264
199
# Used by run-client
265
200
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
267
202
        ./mandos-keygen --dir keydir --force
268
203
 
269
204
# 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)
 
205
run-server: confdir/mandos.conf confdir/clients.conf
 
206
        ./mandos --debug --configdir=confdir
273
207
 
274
208
# Used by run-server
275
209
confdir/mandos.conf: mandos.conf
280
214
        install --mode=u=rw $< $@
281
215
# Add a client password
282
216
        ./mandos-keygen --dir keydir --password >> $@
283
 
statedir:
284
 
        install --directory statedir
285
217
 
286
218
install: install-server install-client-nokey
287
219
 
292
224
 
293
225
install-server: doc
294
226
        install --directory $(CONFDIR)
295
 
        install --directory --mode=u=rwx --owner=$(USER) \
296
 
                --group=$(GROUP) $(STATEDIR)
297
227
        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
228
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
303
229
                mandos.conf
304
230
        install --mode=u=rw --target-directory=$(CONFDIR) \
305
231
                clients.conf
306
 
        install --mode=u=rw,go=r dbus-mandos.conf \
307
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
308
232
        install --mode=u=rwx,go=rx init.d-mandos \
309
233
                $(DESTDIR)/etc/init.d/mandos
310
234
        install --mode=u=rw,go=r default-mandos \
314
238
        fi
315
239
        gzip --best --to-stdout mandos.8 \
316
240
                > $(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
241
        gzip --best --to-stdout mandos.conf.5 \
322
242
                > $(MANDIR)/man5/mandos.conf.5.gz
323
243
        gzip --best --to-stdout mandos-clients.conf.5 \
324
244
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
325
 
        gzip --best --to-stdout intro.8mandos \
326
 
                > $(MANDIR)/man8/intro.8mandos.gz
327
245
 
328
246
install-client-nokey: all doc
329
247
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
333
251
                install --mode=u=rwx \
334
252
                        --directory "$(CONFDIR)/plugins.d"; \
335
253
        fi
336
 
        install --mode=u=rwx,go=rx --directory \
337
 
                "$(CONFDIR)/network-hooks.d"
338
254
        install --mode=u=rwx,go=rx \
339
255
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
340
256
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
354
270
        install --mode=u=rwxs,go=rx \
355
271
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
356
272
                plugins.d/askpass-fifo
357
 
        install --mode=u=rwxs,go=rx \
358
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
359
 
                plugins.d/plymouth
360
273
        install initramfs-tools-hook \
361
274
                $(INITRAMFSTOOLS)/hooks/mandos
362
275
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
363
276
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
364
277
        install initramfs-tools-script \
365
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
278
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
366
279
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
367
280
        gzip --best --to-stdout mandos-keygen.8 \
368
281
                > $(MANDIR)/man8/mandos-keygen.8.gz
369
282
        gzip --best --to-stdout plugin-runner.8mandos \
370
283
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
284
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
285
                > $(MANDIR)/man8/password-prompt.8mandos.gz
371
286
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
372
287
                > $(MANDIR)/man8/mandos-client.8mandos.gz
373
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
374
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
375
288
        gzip --best --to-stdout plugins.d/usplash.8mandos \
376
289
                > $(MANDIR)/man8/usplash.8mandos.gz
377
290
        gzip --best --to-stdout plugins.d/splashy.8mandos \
378
291
                > $(MANDIR)/man8/splashy.8mandos.gz
379
292
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
380
293
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
381
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
382
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
383
294
 
384
295
install-client: install-client-nokey
385
296
# Post-installation stuff
391
302
 
392
303
uninstall-server:
393
304
        -rm --force $(PREFIX)/sbin/mandos \
394
 
                $(PREFIX)/sbin/mandos-ctl \
395
 
                $(PREFIX)/sbin/mandos-monitor \
396
305
                $(MANDIR)/man8/mandos.8.gz \
397
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
398
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
399
306
                $(MANDIR)/man5/mandos.conf.5.gz \
400
307
                $(MANDIR)/man5/mandos-clients.conf.5.gz
401
308
        update-rc.d -f mandos remove
413
320
                $(PREFIX)/lib/mandos/plugins.d/usplash \
414
321
                $(PREFIX)/lib/mandos/plugins.d/splashy \
415
322
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
416
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
417
323
                $(INITRAMFSTOOLS)/hooks/mandos \
418
324
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
419
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
325
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
326
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
420
327
                $(MANDIR)/man8/mandos-keygen.8.gz \
421
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
422
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
423
328
                $(MANDIR)/man8/password-prompt.8mandos.gz \
424
329
                $(MANDIR)/man8/usplash.8mandos.gz \
425
330
                $(MANDIR)/man8/splashy.8mandos.gz \
426
331
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
427
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
332
                $(MANDIR)/man8/mandos-client.8mandos.gz
428
333
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
429
334
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
430
335
        update-initramfs -k all -u
433
338
 
434
339
purge-server: uninstall-server
435
340
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
436
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
437
341
                $(DESTDIR)/etc/default/mandos \
438
342
                $(DESTDIR)/etc/init.d/mandos \
439
 
                $(DESTDIR)/run/mandos.pid
 
343
                $(DESTDIR)/var/run/mandos.pid
440
344
        -rmdir $(CONFDIR)
441
345
 
442
346
purge-client: uninstall-client