/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

Merge from trunk; Better parsing of numbers in command line options,
new "mandos=off" kernel parameter, plus other smaller fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
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 \
 
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
 
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
 
3
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
6
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
7
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
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
 
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
 
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
 
8
#       -Wunreachable-code 
13
9
#DEBUG=-ggdb3
14
 
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
15
 
# and <http://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=address -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=
33
 
 
34
 
# If BROKEN_PIE is set, do not build with -pie
35
 
ifndef BROKEN_PIE
36
 
FORTIFY += -fPIE
37
 
LINK_FORTIFY += -pie
38
 
endif
 
10
# For info about _FORTIFY_SOURCE, see
 
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
13
LINK_FORTIFY_LD=-z relro -fPIE
 
14
LINK_FORTIFY=-pie
39
15
#COVERAGE=--coverage
40
 
OPTIMIZE=-Os -fno-strict-aliasing
41
 
LANGUAGE=-std=gnu11
 
16
OPTIMIZE=-Os
 
17
LANGUAGE=-std=gnu99
42
18
htmldir=man
43
 
version=1.7.10
 
19
version=1.0.3
44
20
SED=sed
45
21
 
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)))
48
 
 
49
22
## Use these settings for a traditional /usr/local install
50
23
# PREFIX=$(DESTDIR)/usr/local
51
24
# CONFDIR=$(DESTDIR)/etc/mandos
52
25
# KEYDIR=$(DESTDIR)/etc/mandos/keys
53
26
# MANDIR=$(PREFIX)/man
54
27
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
55
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
56
 
# LIBDIR=$(PREFIX)/lib
57
28
##
58
29
 
59
30
## These settings are for a package-type install
62
33
KEYDIR=$(DESTDIR)/etc/keys/mandos
63
34
MANDIR=$(PREFIX)/share/man
64
35
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)
75
36
##
76
37
 
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)
 
38
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
82
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
83
41
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; \
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)
 
42
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
43
GPGME_LIBS=$(shell gpgme-config --libs)
89
44
 
90
45
# Do not change these two
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))
 
46
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
47
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
 
48
        -DVERSION='"$(version)"'
 
49
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
95
50
 
96
51
# Commands to format a DocBook <refentry> document into a manual page
97
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
52
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
98
53
        --param man.charmap.use.subset          0 \
99
54
        --param make.year.ranges                1 \
100
55
        --param make.single.year.ranges         1 \
101
56
        --param man.output.quietly              1 \
102
57
        --param man.authors.section.enabled     0 \
103
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
58
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
104
59
        $(notdir $<); \
105
 
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
106
 
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
107
 
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
108
 
        fi >/dev/null)
 
60
        $(MANPOST) $(notdir $@)
 
61
# DocBook-to-man post-processing to fix a '\n' escape bug
 
62
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
109
63
 
110
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
64
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
111
65
        --param make.year.ranges                1 \
112
66
        --param make.single.year.ranges         1 \
113
67
        --param man.output.quietly              1 \
115
69
        --param citerefentry.link               1 \
116
70
        --output $@ \
117
71
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
118
 
        $<; $(HTMLPOST) $@)
 
72
        $<; $(HTMLPOST) $@
119
73
# Fix citerefentry links
120
74
HTMLPOST=$(SED) --in-place \
121
75
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
122
76
 
123
77
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
124
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
125
 
        plugins.d/plymouth
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 \
130
 
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
 
78
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
 
79
CPROGS=plugin-runner $(PLUGINS)
 
80
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
81
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
131
82
        plugins.d/mandos-client.8mandos \
132
 
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
133
 
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
134
 
        plugins.d/plymouth.8mandos intro.8mandos
 
83
        plugins.d/password-prompt.8mandos mandos.conf.5 \
 
84
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
85
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
135
86
 
136
87
htmldocs=$(addsuffix .xhtml,$(DOCS))
137
88
 
158
109
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
159
110
        $(DOCBOOKTOHTML)
160
111
 
161
 
intro.8mandos: intro.xml common.ent legalnotice.xml
162
 
        $(DOCBOOKTOMAN)
163
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
164
 
        $(DOCBOOKTOHTML)
165
 
 
166
112
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
167
113
                legalnotice.xml
168
114
        $(DOCBOOKTOMAN)
177
123
                 legalnotice.xml
178
124
        $(DOCBOOKTOHTML)
179
125
 
180
 
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
181
 
                legalnotice.xml
182
 
        $(DOCBOOKTOMAN)
183
 
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
184
 
                 legalnotice.xml
185
 
        $(DOCBOOKTOHTML)
186
 
 
187
 
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
188
 
                legalnotice.xml
189
 
        $(DOCBOOKTOMAN)
190
 
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
191
 
                 legalnotice.xml
192
 
        $(DOCBOOKTOHTML)
193
 
 
194
126
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
195
127
                legalnotice.xml
196
128
        $(DOCBOOKTOMAN)
218
150
 
219
151
# Update all these files with version number $(version)
220
152
common.ent: Makefile
221
 
        $(strip $(SED) --in-place \
222
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
223
 
                $@)
 
153
        $(SED) --in-place \
 
154
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
155
                $@
224
156
 
225
157
mandos: Makefile
226
 
        $(strip $(SED) --in-place \
 
158
        $(SED) --in-place \
227
159
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
228
 
                $@)
 
160
                $@
229
161
 
230
162
mandos-keygen: Makefile
231
 
        $(strip $(SED) --in-place \
 
163
        $(SED) --in-place \
232
164
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
233
 
                $@)
 
165
                $@
234
166
 
235
167
mandos-ctl: Makefile
236
 
        $(strip $(SED) --in-place \
237
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
238
 
                $@)
239
 
 
240
 
mandos-monitor: Makefile
241
 
        $(strip $(SED) --in-place \
242
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
243
 
                $@)
 
168
        $(SED) --in-place \
 
169
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
170
                $@
244
171
 
245
172
mandos.lsm: Makefile
246
 
        $(strip $(SED) --in-place \
 
173
        $(SED) --in-place \
247
174
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
248
 
                $@)
249
 
        $(strip $(SED) --in-place \
 
175
                $@
 
176
        $(SED) --in-place \
250
177
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
251
 
                $@)
252
 
        $(strip $(SED) --in-place \
 
178
                $@
 
179
        $(SED) --in-place \
253
180
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
254
 
                $@)
255
 
 
256
 
plugins.d/mandos-client: plugins.d/mandos-client.c
257
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
258
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
259
 
 
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
 
181
                $@
 
182
 
 
183
plugins.d/mandos-client: plugins.d/mandos-client.o
 
184
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
185
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
186
 
 
187
.PHONY : all doc html clean distclean run-client run-server install \
 
188
        install-server install-client uninstall uninstall-server \
 
189
        uninstall-client purge purge-server purge-client
269
190
 
270
191
clean:
271
192
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
273
194
distclean: clean
274
195
mostlyclean: clean
275
196
maintainer-clean: clean
276
 
        -rm --force --recursive keydir confdir statedir
 
197
        -rm --force --recursive keydir confdir
277
198
 
278
199
check:  all
279
200
        ./mandos --check
280
 
        ./mandos-ctl --check
281
201
 
282
202
# Run the client with a local config and key
283
203
run-client: all keydir/seckey.txt keydir/pubkey.txt
284
 
        @echo "###################################################################"
285
 
        @echo "# The following error messages are harmless and can be safely     #"
286
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
287
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
288
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
289
 
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
290
 
        @echo "#                     setuid: Operation not permitted             #"
291
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
292
 
        @echo "# From mandos-client:                                             #"
293
 
        @echo "#             Failed to raise privileges: Operation not permitted #"
294
 
        @echo "#             Warning: network hook \"*\" exited with status *      #"
295
 
        @echo "###################################################################"
296
 
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
297
204
        ./plugin-runner --plugin-dir=plugins.d \
298
 
                --plugin-helper-dir=plugin-helpers \
299
205
                --config-file=plugin-runner.conf \
300
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
301
 
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
 
206
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
302
207
                $(CLIENTARGS)
303
208
 
304
209
# Used by run-client
307
212
        ./mandos-keygen --dir keydir --force
308
213
 
309
214
# Run the server with a local config
310
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
311
 
        ./mandos --debug --no-dbus --configdir=confdir \
312
 
                --statedir=statedir $(SERVERARGS)
 
215
run-server: confdir/mandos.conf confdir/clients.conf
 
216
        ./mandos --debug --configdir=confdir $(SERVERARGS)
313
217
 
314
218
# Used by run-server
315
219
confdir/mandos.conf: mandos.conf
319
223
        install --directory confdir
320
224
        install --mode=u=rw $< $@
321
225
# Add a client password
322
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
323
 
statedir:
324
 
        install --directory statedir
 
226
        ./mandos-keygen --dir keydir --password >> $@
325
227
 
326
228
install: install-server install-client-nokey
327
229
 
332
234
 
333
235
install-server: doc
334
236
        install --directory $(CONFDIR)
335
 
        if install --directory --mode=u=rwx --owner=$(USER) \
336
 
                --group=$(GROUP) $(STATEDIR); then \
337
 
                :; \
338
 
        elif install --directory --mode=u=rwx $(STATEDIR); then \
339
 
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
340
 
        fi
341
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
342
 
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
343
 
                        $(TMPFILES)/mandos.conf; \
344
 
        fi
345
237
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
346
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
347
 
                mandos-ctl
348
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
349
 
                mandos-monitor
350
238
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
351
239
                mandos.conf
352
240
        install --mode=u=rw --target-directory=$(CONFDIR) \
353
241
                clients.conf
354
 
        install --mode=u=rw,go=r dbus-mandos.conf \
355
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
356
242
        install --mode=u=rwx,go=rx init.d-mandos \
357
243
                $(DESTDIR)/etc/init.d/mandos
358
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
359
 
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
360
 
        fi
361
244
        install --mode=u=rw,go=r default-mandos \
362
245
                $(DESTDIR)/etc/default/mandos
363
246
        if [ -z $(DESTDIR) ]; then \
365
248
        fi
366
249
        gzip --best --to-stdout mandos.8 \
367
250
                > $(MANDIR)/man8/mandos.8.gz
368
 
        gzip --best --to-stdout mandos-monitor.8 \
369
 
                > $(MANDIR)/man8/mandos-monitor.8.gz
370
 
        gzip --best --to-stdout mandos-ctl.8 \
371
 
                > $(MANDIR)/man8/mandos-ctl.8.gz
372
251
        gzip --best --to-stdout mandos.conf.5 \
373
252
                > $(MANDIR)/man5/mandos.conf.5.gz
374
253
        gzip --best --to-stdout mandos-clients.conf.5 \
375
254
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
376
 
        gzip --best --to-stdout intro.8mandos \
377
 
                > $(MANDIR)/man8/intro.8mandos.gz
378
255
 
379
256
install-client-nokey: all doc
380
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
257
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
381
258
        install --directory --mode=u=rwx $(KEYDIR) \
382
 
                $(LIBDIR)/mandos/plugins.d \
383
 
                $(LIBDIR)/mandos/plugin-helpers
384
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
259
                $(PREFIX)/lib/mandos/plugins.d
 
260
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
385
261
                install --mode=u=rwx \
386
 
                        --directory "$(CONFDIR)/plugins.d" \
387
 
                        "$(CONFDIR)/plugin-helpers"; \
 
262
                        --directory "$(CONFDIR)/plugins.d"; \
388
263
        fi
389
 
        install --mode=u=rwx,go=rx --directory \
390
 
                "$(CONFDIR)/network-hooks.d"
391
264
        install --mode=u=rwx,go=rx \
392
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
265
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
393
266
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
394
267
                mandos-keygen
395
268
        install --mode=u=rwx,go=rx \
396
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
269
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
397
270
                plugins.d/password-prompt
398
271
        install --mode=u=rwxs,go=rx \
399
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
272
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
400
273
                plugins.d/mandos-client
401
274
        install --mode=u=rwxs,go=rx \
402
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
275
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
403
276
                plugins.d/usplash
404
277
        install --mode=u=rwxs,go=rx \
405
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
278
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
406
279
                plugins.d/splashy
407
280
        install --mode=u=rwxs,go=rx \
408
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
281
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
409
282
                plugins.d/askpass-fifo
410
 
        install --mode=u=rwxs,go=rx \
411
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
412
 
                plugins.d/plymouth
413
 
        install --mode=u=rwx,go=rx \
414
 
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
415
 
                plugin-helpers/mandos-client-iprouteadddel
416
283
        install initramfs-tools-hook \
417
284
                $(INITRAMFSTOOLS)/hooks/mandos
418
285
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
419
286
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
420
287
        install initramfs-tools-script \
421
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
288
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
422
289
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
423
290
        gzip --best --to-stdout mandos-keygen.8 \
424
291
                > $(MANDIR)/man8/mandos-keygen.8.gz
425
292
        gzip --best --to-stdout plugin-runner.8mandos \
426
293
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
294
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
295
                > $(MANDIR)/man8/password-prompt.8mandos.gz
427
296
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
428
297
                > $(MANDIR)/man8/mandos-client.8mandos.gz
429
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
430
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
431
298
        gzip --best --to-stdout plugins.d/usplash.8mandos \
432
299
                > $(MANDIR)/man8/usplash.8mandos.gz
433
300
        gzip --best --to-stdout plugins.d/splashy.8mandos \
434
301
                > $(MANDIR)/man8/splashy.8mandos.gz
435
302
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
436
303
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
437
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
438
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
439
304
 
440
305
install-client: install-client-nokey
441
306
# Post-installation stuff
447
312
 
448
313
uninstall-server:
449
314
        -rm --force $(PREFIX)/sbin/mandos \
450
 
                $(PREFIX)/sbin/mandos-ctl \
451
 
                $(PREFIX)/sbin/mandos-monitor \
452
315
                $(MANDIR)/man8/mandos.8.gz \
453
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
454
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
455
316
                $(MANDIR)/man5/mandos.conf.5.gz \
456
317
                $(MANDIR)/man5/mandos-clients.conf.5.gz
457
318
        update-rc.d -f mandos remove
463
324
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
464
325
                $(DESTDIR)/etc/crypttab
465
326
        -rm --force $(PREFIX)/sbin/mandos-keygen \
466
 
                $(LIBDIR)/mandos/plugin-runner \
467
 
                $(LIBDIR)/mandos/plugins.d/password-prompt \
468
 
                $(LIBDIR)/mandos/plugins.d/mandos-client \
469
 
                $(LIBDIR)/mandos/plugins.d/usplash \
470
 
                $(LIBDIR)/mandos/plugins.d/splashy \
471
 
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
472
 
                $(LIBDIR)/mandos/plugins.d/plymouth \
 
327
                $(PREFIX)/lib/mandos/plugin-runner \
 
328
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
 
329
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
330
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
331
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
332
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
473
333
                $(INITRAMFSTOOLS)/hooks/mandos \
474
334
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
475
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
335
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
336
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
476
337
                $(MANDIR)/man8/mandos-keygen.8.gz \
477
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
478
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
479
338
                $(MANDIR)/man8/password-prompt.8mandos.gz \
480
339
                $(MANDIR)/man8/usplash.8mandos.gz \
481
340
                $(MANDIR)/man8/splashy.8mandos.gz \
482
341
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
483
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
484
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
485
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
342
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
343
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
344
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
486
345
        update-initramfs -k all -u
487
346
 
488
347
purge: purge-server purge-client
489
348
 
490
349
purge-server: uninstall-server
491
350
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
492
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
493
351
                $(DESTDIR)/etc/default/mandos \
494
352
                $(DESTDIR)/etc/init.d/mandos \
495
 
                $(SYSTEMD)/mandos.service \
496
 
                $(DESTDIR)/run/mandos.pid \
497
353
                $(DESTDIR)/var/run/mandos.pid
498
354
        -rmdir $(CONFDIR)
499
355