/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: 2018-02-12 14:54:58 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 364.
  • Revision ID: teddy@recompile.se-20180212145458-mkcjkw4cd9s18izm
Client bug fix: Revert change to plugin-runner

* plugin-runner.c (free_plugin): Bug fix: Don't free() plugin name.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
 
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
 
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
1
WARN:=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
 
2
        -Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
 
3
        -Wunused -Wuninitialized -Wstrict-overflow=5 \
 
4
        -Wsuggest-attribute=pure -Wsuggest-attribute=const \
 
5
        -Wsuggest-attribute=noreturn -Wfloat-equal -Wundef -Wshadow \
4
6
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
7
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
 
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
 
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code
9
 
#DEBUG=-ggdb3
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=
 
8
        -Wconversion -Wlogical-op -Waggregate-return \
 
9
        -Wstrict-prototypes -Wold-style-definition \
 
10
        -Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
 
11
        -Wredundant-decls -Wnested-externs -Winline -Wvla \
 
12
        -Wvolatile-register-var -Woverlength-strings
 
13
#DEBUG:=-ggdb3 -fsanitize=address 
 
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
 
15
# and <https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
16
FORTIFY:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
 
17
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
 
18
ALL_SANITIZE_OPTIONS:=-fsanitize=leak -fsanitize=undefined \
 
19
        -fsanitize=shift -fsanitize=integer-divide-by-zero \
 
20
        -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null \
 
21
        -fsanitize=return -fsanitize=signed-integer-overflow \
 
22
        -fsanitize=bounds -fsanitize=alignment \
 
23
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
 
24
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
 
25
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
 
26
        -fsanitize=enum
 
27
# Check which sanitizing options can be used
 
28
SANITIZE:=$(foreach option,$(ALL_SANITIZE_OPTIONS),$(shell \
 
29
        echo 'int main(){}' | $(CC) --language=c $(option) /dev/stdin \
 
30
        -o /dev/null >/dev/null 2>&1 && echo $(option)))
 
31
LINK_FORTIFY_LD:=-z relro -z now
 
32
LINK_FORTIFY:=
16
33
 
17
34
# If BROKEN_PIE is set, do not build with -pie
18
35
ifndef BROKEN_PIE
20
37
LINK_FORTIFY += -pie
21
38
endif
22
39
#COVERAGE=--coverage
23
 
OPTIMIZE=-Os
24
 
LANGUAGE=-std=gnu99
25
 
htmldir=man
26
 
version=1.6.1
27
 
SED=sed
 
40
OPTIMIZE:=-Os -fno-strict-aliasing
 
41
LANGUAGE:=-std=gnu11
 
42
htmldir:=man
 
43
version:=1.7.17
 
44
SED:=sed
28
45
 
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)))
 
46
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
 
47
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nogroup || echo 65534)))
31
48
 
32
49
## Use these settings for a traditional /usr/local install
33
 
# PREFIX=$(DESTDIR)/usr/local
34
 
# CONFDIR=$(DESTDIR)/etc/mandos
35
 
# KEYDIR=$(DESTDIR)/etc/mandos/keys
36
 
# MANDIR=$(PREFIX)/man
37
 
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
50
# PREFIX:=$(DESTDIR)/usr/local
 
51
# CONFDIR:=$(DESTDIR)/etc/mandos
 
52
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
 
53
# MANDIR:=$(PREFIX)/man
 
54
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
 
55
# STATEDIR:=$(DESTDIR)/var/lib/mandos
 
56
# LIBDIR:=$(PREFIX)/lib
39
57
##
40
58
 
41
59
## These settings are for a package-type install
42
 
PREFIX=$(DESTDIR)/usr
43
 
CONFDIR=$(DESTDIR)/etc/mandos
44
 
KEYDIR=$(DESTDIR)/etc/keys/mandos
45
 
MANDIR=$(PREFIX)/share/man
46
 
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
 
STATEDIR=$(DESTDIR)/var/lib/mandos
 
60
PREFIX:=$(DESTDIR)/usr
 
61
CONFDIR:=$(DESTDIR)/etc/mandos
 
62
KEYDIR:=$(DESTDIR)/etc/keys/mandos
 
63
MANDIR:=$(PREFIX)/share/man
 
64
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
 
65
STATEDIR:=$(DESTDIR)/var/lib/mandos
 
66
LIBDIR:=$(shell \
 
67
        for d in \
 
68
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
69
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
 
70
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
 
71
                        echo "$(DESTDIR)$$d"; \
 
72
                        break; \
 
73
                fi; \
 
74
        done)
48
75
##
49
76
 
50
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
51
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
52
 
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
53
 
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; \
 
77
SYSTEMD:=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
78
TMPFILES:=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
 
79
 
 
80
GNUTLS_CFLAGS:=$(shell pkg-config --cflags-only-I gnutls)
 
81
GNUTLS_LIBS:=$(shell pkg-config --libs gnutls)
 
82
AVAHI_CFLAGS:=$(shell pkg-config --cflags-only-I avahi-core)
 
83
AVAHI_LIBS:=$(shell pkg-config --libs avahi-core)
 
84
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
85
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
56
86
        getconf LFS_LDFLAGS)
 
87
LIBNL3_CFLAGS:=$(shell pkg-config --cflags-only-I libnl-route-3.0)
 
88
LIBNL3_LIBS:=$(shell pkg-config --libs libnl-route-3.0)
57
89
 
58
90
# Do not change these two
59
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
60
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
61
 
        -DVERSION='"$(version)"'
62
 
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
91
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
 
92
        $(OPTIMIZE) $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) \
 
93
        $(GPGME_CFLAGS) -DVERSION='"$(version)"'
 
94
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
63
95
 
64
96
# Commands to format a DocBook <refentry> document into a manual page
65
97
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
70
102
        --param man.authors.section.enabled     0 \
71
103
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
104
        $(notdir $<); \
73
 
        $(MANPOST) $(notdir $@);\
74
105
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
75
106
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
76
107
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
77
108
        fi >/dev/null)
78
 
# DocBook-to-man post-processing to fix a '\n' escape bug
79
 
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
80
109
 
81
110
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
82
111
        --param make.year.ranges                1 \
88
117
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
89
118
        $<; $(HTMLPOST) $@)
90
119
# Fix citerefentry links
91
 
HTMLPOST=$(SED) --in-place \
 
120
HTMLPOST:=$(SED) --in-place \
92
121
        --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
122
 
94
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
 
123
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
95
124
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
96
125
        plugins.d/plymouth
97
 
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 \
 
126
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
 
127
CPROGS:=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
128
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
129
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
100
130
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
101
131
        plugins.d/mandos-client.8mandos \
102
132
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
103
133
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
104
134
        plugins.d/plymouth.8mandos intro.8mandos
105
135
 
106
 
htmldocs=$(addsuffix .xhtml,$(DOCS))
 
136
htmldocs:=$(addsuffix .xhtml,$(DOCS))
107
137
 
108
 
objects=$(addsuffix .o,$(CPROGS))
 
138
objects:=$(addsuffix .o,$(CPROGS))
109
139
 
110
140
all: $(PROGS) mandos.lsm
111
141
 
227
257
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
228
258
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
229
259
 
230
 
.PHONY : all doc html clean distclean run-client run-server install \
231
 
        install-server install-client uninstall uninstall-server \
232
 
        uninstall-client purge purge-server purge-client
 
260
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
 
261
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
 
262
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
263
 
 
264
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
 
265
        check run-client run-server install install-html \
 
266
        install-server install-client-nokey install-client uninstall \
 
267
        uninstall-server uninstall-client purge purge-server \
 
268
        purge-client
233
269
 
234
270
clean:
235
271
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
247
283
run-client: all keydir/seckey.txt keydir/pubkey.txt
248
284
        @echo "###################################################################"
249
285
        @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             #"
 
286
        @echo "# ignored:                                                        #"
 
287
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
 
288
        @echo "#                     setuid: Operation not permitted             #"
254
289
        @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            #"
 
290
        @echo "# From mandos-client:                                             #"
 
291
        @echo "#             Failed to raise privileges: Operation not permitted #"
 
292
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
293
        @echo "#                                                                 #"
 
294
        @echo "# (The messages are caused by not running as root, but you should #"
 
295
        @echo "# NOT run \"make run-client\" as root unless you also unpacked and  #"
 
296
        @echo "# compiled Mandos as root, which is also NOT recommended.)        #"
258
297
        @echo "###################################################################"
 
298
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
259
299
        ./plugin-runner --plugin-dir=plugins.d \
 
300
                --plugin-helper-dir=plugin-helpers \
260
301
                --config-file=plugin-runner.conf \
261
302
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
303
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
262
304
                $(CLIENTARGS)
263
305
 
264
306
# Used by run-client
279
321
        install --directory confdir
280
322
        install --mode=u=rw $< $@
281
323
# Add a client password
282
 
        ./mandos-keygen --dir keydir --password >> $@
 
324
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
283
325
statedir:
284
326
        install --directory statedir
285
327
 
292
334
 
293
335
install-server: doc
294
336
        install --directory $(CONFDIR)
295
 
        install --directory --mode=u=rwx --owner=$(USER) \
296
 
                --group=$(GROUP) $(STATEDIR)
 
337
        if install --directory --mode=u=rwx --owner=$(USER) \
 
338
                --group=$(GROUP) $(STATEDIR); then \
 
339
                :; \
 
340
        elif install --directory --mode=u=rwx $(STATEDIR); then \
 
341
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
 
342
        fi
 
343
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
 
344
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
 
345
                        $(TMPFILES)/mandos.conf; \
 
346
        fi
297
347
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
298
348
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
299
349
                mandos-ctl
307
357
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
308
358
        install --mode=u=rwx,go=rx init.d-mandos \
309
359
                $(DESTDIR)/etc/init.d/mandos
 
360
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
361
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
362
        fi
310
363
        install --mode=u=rw,go=r default-mandos \
311
364
                $(DESTDIR)/etc/default/mandos
312
365
        if [ -z $(DESTDIR) ]; then \
326
379
                > $(MANDIR)/man8/intro.8mandos.gz
327
380
 
328
381
install-client-nokey: all doc
329
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
382
        install --directory $(LIBDIR)/mandos $(CONFDIR)
330
383
        install --directory --mode=u=rwx $(KEYDIR) \
331
 
                $(PREFIX)/lib/mandos/plugins.d
332
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
384
                $(LIBDIR)/mandos/plugins.d \
 
385
                $(LIBDIR)/mandos/plugin-helpers
 
386
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
333
387
                install --mode=u=rwx \
334
 
                        --directory "$(CONFDIR)/plugins.d"; \
 
388
                        --directory "$(CONFDIR)/plugins.d" \
 
389
                        "$(CONFDIR)/plugin-helpers"; \
335
390
        fi
336
391
        install --mode=u=rwx,go=rx --directory \
337
392
                "$(CONFDIR)/network-hooks.d"
338
393
        install --mode=u=rwx,go=rx \
339
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
394
                --target-directory=$(LIBDIR)/mandos plugin-runner
340
395
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
341
396
                mandos-keygen
342
397
        install --mode=u=rwx,go=rx \
343
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
398
                --target-directory=$(LIBDIR)/mandos/plugins.d \
344
399
                plugins.d/password-prompt
345
400
        install --mode=u=rwxs,go=rx \
346
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
401
                --target-directory=$(LIBDIR)/mandos/plugins.d \
347
402
                plugins.d/mandos-client
348
403
        install --mode=u=rwxs,go=rx \
349
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
404
                --target-directory=$(LIBDIR)/mandos/plugins.d \
350
405
                plugins.d/usplash
351
406
        install --mode=u=rwxs,go=rx \
352
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
407
                --target-directory=$(LIBDIR)/mandos/plugins.d \
353
408
                plugins.d/splashy
354
409
        install --mode=u=rwxs,go=rx \
355
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
410
                --target-directory=$(LIBDIR)/mandos/plugins.d \
356
411
                plugins.d/askpass-fifo
357
412
        install --mode=u=rwxs,go=rx \
358
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
413
                --target-directory=$(LIBDIR)/mandos/plugins.d \
359
414
                plugins.d/plymouth
 
415
        install --mode=u=rwx,go=rx \
 
416
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
 
417
                plugin-helpers/mandos-client-iprouteadddel
360
418
        install initramfs-tools-hook \
361
419
                $(INITRAMFSTOOLS)/hooks/mandos
362
420
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
407
465
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
408
466
                $(DESTDIR)/etc/crypttab
409
467
        -rm --force $(PREFIX)/sbin/mandos-keygen \
410
 
                $(PREFIX)/lib/mandos/plugin-runner \
411
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
412
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
413
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
414
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
415
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
416
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
 
468
                $(LIBDIR)/mandos/plugin-runner \
 
469
                $(LIBDIR)/mandos/plugins.d/password-prompt \
 
470
                $(LIBDIR)/mandos/plugins.d/mandos-client \
 
471
                $(LIBDIR)/mandos/plugins.d/usplash \
 
472
                $(LIBDIR)/mandos/plugins.d/splashy \
 
473
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
 
474
                $(LIBDIR)/mandos/plugins.d/plymouth \
417
475
                $(INITRAMFSTOOLS)/hooks/mandos \
418
476
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
419
477
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
425
483
                $(MANDIR)/man8/splashy.8mandos.gz \
426
484
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
427
485
                $(MANDIR)/man8/plymouth.8mandos.gz \
428
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
429
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
486
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
487
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
430
488
        update-initramfs -k all -u
431
489
 
432
490
purge: purge-server purge-client
436
494
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
437
495
                $(DESTDIR)/etc/default/mandos \
438
496
                $(DESTDIR)/etc/init.d/mandos \
 
497
                $(SYSTEMD)/mandos.service \
 
498
                $(DESTDIR)/run/mandos.pid \
439
499
                $(DESTDIR)/var/run/mandos.pid
440
500
        -rmdir $(CONFDIR)
441
501