/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: 2009-02-09 02:01:13 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090209020113-726hq380zvp8zt97
Four new interrelated features:

1. Support using a different network interface via both initramfs.conf
   (the DEVICE setting) and the kernel command line (sixth field of
   the "ip=" option as in Linux' Documentation/nfsroot.txt).

2. Support connecting to a specified Mandos server directly using a
   kernel command line option ("mandos=connect:<ADDRESS>:<PORT>").

3. Support connecting directly to an IPv4 address (and port) using the
   "--connect" option of mandos-client.

4. Support an empty string to the --interface option to mandos-client.

* Makefile (WARN): Increase strictness by changing to
                   "-Wstrict-aliasing=1".

* debian/mandos-client.README.Debian (Use the Correct Network
  Interface): Changed to refer to initramfs.conf and nfsroot.txt.
  (Test the Server): Improve wording.
  (Non-local Connection): New section.
* initramfs-tools-script: Obey DEVICE environment variable and setting
                          from "/conf/initramfs.conf".  Also let any
                          "ip=" kernel command line option override
                          it.  Support new "mandos=connect" option.
                          Call "configure_networking" to set up IP
                          address on interface if necessary.
* plugin-runner.conf: Change example.
* plugins.d/mandos-client.c: Some whitespace and comment changes.
  (start_mandos_communication): Take an additional argument for
                                address family, all callers changed.
                                Connect to an IPv4 address if address
                                family is AF_INET.  Only set IPv6
                                scope_id for link-local addresses.
  (main): Accept empty interface name; this will not bring up any
         interface and leave the interface as unspecified.  Also do
         not restore kernel log level if lowering it failed.
* plugins.d/mandos-client.xml (OPTIONS): Document that the
                                         "--interface" option accepts
                                         an empty string.
  (EXAMPLE): Change example IPv6 address to a link-local address.

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