/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-09-06 15:34:21 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080906153421-605ydhwyo404krh9
* initramfs-tools-hook: Use long options where available.  Use only
                        one "test" invocation instead of several.

* mandos-keygen: Use only one "test" invocation instead of several.
                 Use long options where available.  Strip newline from
                 entered password.

* plugin-runner.c (print_out_password): Do not strip trailing newline.
  (fallback): Strip trailing newline from getpass().

* plugin-runner.xml (PLUGINS): Plugins should not print trailing
                               newlines.

* plugins.d/password-prompt.c (main): Strip trailing newline.

* plugins.d/password-request.c (main): Bug fix: Read "pubkey.txt", not
                                       "pupkey.txt".

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
 
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code
9
 
#DEBUG=-ggdb3
 
7
        -Wpacked -Wnested-externs -Wunreachable-code -Winline \
 
8
        -Wvolatile-register-var
 
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
22
13
#COVERAGE=--coverage
23
14
OPTIMIZE=-Os
24
15
LANGUAGE=-std=gnu99
25
 
htmldir=man
26
 
version=1.6.1
27
 
SED=sed
28
 
 
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
 
## 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
39
 
##
40
 
 
41
 
## These settings are for a package-type install
 
16
# PREFIX=/usr/local
42
17
PREFIX=$(DESTDIR)/usr
 
18
# CONFDIR=/usr/local/lib/mandos
43
19
CONFDIR=$(DESTDIR)/etc/mandos
 
20
# KEYDIR=/usr/local/lib/mandos/keys
44
21
KEYDIR=$(DESTDIR)/etc/keys/mandos
45
 
MANDIR=$(PREFIX)/share/man
46
 
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
 
STATEDIR=$(DESTDIR)/var/lib/mandos
48
 
##
 
22
# MANDIR=/usr/local/man
 
23
MANDIR=$(DESTDIR)/usr/share/man
49
24
 
50
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
51
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
25
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
26
GNUTLS_LIBS=$(shell libgnutls-config --libs)
52
27
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
53
28
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)
 
29
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
30
GPGME_LIBS=$(shell gpgme-config --libs)
57
31
 
58
32
# Do not change these two
59
33
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))
 
34
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
 
35
LDFLAGS=$(COVERAGE)
63
36
 
64
 
# Commands to format a DocBook <refentry> document into a manual page
65
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
37
# Commands to format a DocBook refentry document into a manual page
 
38
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
66
39
        --param man.charmap.use.subset          0 \
67
40
        --param make.year.ranges                1 \
68
41
        --param make.single.year.ranges         1 \
69
42
        --param man.output.quietly              1 \
70
43
        --param man.authors.section.enabled     0 \
71
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
44
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
45
        $(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)
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
 
 
81
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
82
 
        --param make.year.ranges                1 \
83
 
        --param make.single.year.ranges         1 \
84
 
        --param man.output.quietly              1 \
85
 
        --param man.authors.section.enabled     0 \
86
 
        --param citerefentry.link               1 \
87
 
        --output $@ \
88
 
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
89
 
        $<; $(HTMLPOST) $@)
90
 
# Fix citerefentry links
91
 
HTMLPOST=$(SED) --in-place \
92
 
        --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
 
 
94
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
95
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
96
 
        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 \
100
 
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
101
 
        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
105
 
 
106
 
htmldocs=$(addsuffix .xhtml,$(DOCS))
107
 
 
108
 
objects=$(addsuffix .o,$(CPROGS))
109
 
 
110
 
all: $(PROGS) mandos.lsm
 
46
        $(MANPOST) $(notdir $@)
 
47
# DocBook-to-man post-processing to fix a \n escape bug
 
48
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
49
 
 
50
PLUGINS=plugins.d/password-prompt plugins.d/password-request
 
51
PROGS=plugin-runner $(PLUGINS)
 
52
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
 
53
        plugins.d/password-request.8mandos \
 
54
        plugins.d/password-prompt.8mandos mandos.conf.5 \
 
55
        mandos-clients.conf.5
 
56
 
 
57
objects=$(addsuffix .o,$(PROGS))
 
58
 
 
59
all: $(PROGS)
111
60
 
112
61
doc: $(DOCS)
113
62
 
114
 
html: $(htmldocs)
115
 
 
116
 
%.5: %.xml common.ent legalnotice.xml
117
 
        $(DOCBOOKTOMAN)
118
 
%.5.xhtml: %.xml common.ent legalnotice.xml
119
 
        $(DOCBOOKTOHTML)
120
 
 
121
 
%.8: %.xml common.ent legalnotice.xml
122
 
        $(DOCBOOKTOMAN)
123
 
%.8.xhtml: %.xml common.ent legalnotice.xml
124
 
        $(DOCBOOKTOHTML)
125
 
 
126
 
%.8mandos: %.xml common.ent legalnotice.xml
127
 
        $(DOCBOOKTOMAN)
128
 
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
129
 
        $(DOCBOOKTOHTML)
130
 
 
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
 
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
137
 
                legalnotice.xml
138
 
        $(DOCBOOKTOMAN)
139
 
mandos.8.xhtml: mandos.xml common.ent mandos-options.xml \
140
 
                overview.xml legalnotice.xml
141
 
        $(DOCBOOKTOHTML)
142
 
 
143
 
mandos-keygen.8: mandos-keygen.xml common.ent overview.xml \
144
 
                legalnotice.xml
145
 
        $(DOCBOOKTOMAN)
146
 
mandos-keygen.8.xhtml: mandos-keygen.xml common.ent overview.xml \
147
 
                 legalnotice.xml
148
 
        $(DOCBOOKTOHTML)
149
 
 
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
 
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
165
 
                legalnotice.xml
166
 
        $(DOCBOOKTOMAN)
167
 
mandos.conf.5.xhtml: mandos.conf.xml common.ent mandos-options.xml \
168
 
                legalnotice.xml
169
 
        $(DOCBOOKTOHTML)
170
 
 
171
 
plugin-runner.8mandos: plugin-runner.xml common.ent overview.xml \
172
 
                legalnotice.xml
173
 
        $(DOCBOOKTOMAN)
174
 
plugin-runner.8mandos.xhtml: plugin-runner.xml common.ent \
175
 
                overview.xml legalnotice.xml
176
 
        $(DOCBOOKTOHTML)
177
 
 
178
 
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
179
 
                                        common.ent \
180
 
                                        mandos-options.xml \
181
 
                                        overview.xml legalnotice.xml
182
 
        $(DOCBOOKTOMAN)
183
 
plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \
184
 
                                        common.ent \
185
 
                                        mandos-options.xml \
186
 
                                        overview.xml legalnotice.xml
187
 
        $(DOCBOOKTOHTML)
188
 
 
189
 
# Update all these files with version number $(version)
190
 
common.ent: Makefile
191
 
        $(strip $(SED) --in-place \
192
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
193
 
                $@)
194
 
 
195
 
mandos: Makefile
196
 
        $(strip $(SED) --in-place \
197
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
198
 
                $@)
199
 
 
200
 
mandos-keygen: Makefile
201
 
        $(strip $(SED) --in-place \
202
 
                --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
 
                $@)
214
 
 
215
 
mandos.lsm: Makefile
216
 
        $(strip $(SED) --in-place \
217
 
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
218
 
                $@)
219
 
        $(strip $(SED) --in-place \
220
 
                --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
 
                $@)
225
 
 
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 $@
229
 
 
230
 
.PHONY : all doc html clean distclean run-client run-server install \
 
63
%.5: %.xml legalnotice.xml
 
64
        $(DOCBOOKTOMAN)
 
65
 
 
66
%.8: %.xml legalnotice.xml
 
67
        $(DOCBOOKTOMAN)
 
68
 
 
69
%.8mandos: %.xml legalnotice.xml
 
70
        $(DOCBOOKTOMAN)
 
71
 
 
72
mandos.8: mandos.xml mandos-options.xml overview.xml legalnotice.xml
 
73
        $(DOCBOOKTOMAN)
 
74
 
 
75
mandos-keygen.8: mandos-keygen.xml overview.xml legalnotice.xml
 
76
        $(DOCBOOKTOMAN)
 
77
 
 
78
mandos.conf.5: mandos.conf.xml mandos-options.xml legalnotice.xml
 
79
        $(DOCBOOKTOMAN)
 
80
 
 
81
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
 
82
        $(DOCBOOKTOMAN)
 
83
 
 
84
plugins.d/password-request.8mandos: plugins.d/password-request.xml \
 
85
                                        mandos-options.xml \
 
86
                                        overview.xml legalnotice.xml
 
87
        $(DOCBOOKTOMAN)
 
88
 
 
89
plugins.d/password-request: plugins.d/password-request.o
 
90
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
91
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
92
 
 
93
.PHONY : all doc clean distclean run-client run-server install \
231
94
        install-server install-client uninstall uninstall-server \
232
95
        uninstall-client purge purge-server purge-client
233
96
 
234
97
clean:
235
 
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
 
98
        -rm --force $(PROGS) $(objects) $(DOCS) core
236
99
 
237
100
distclean: clean
238
101
mostlyclean: clean
239
102
maintainer-clean: clean
240
 
        -rm --force --recursive keydir confdir statedir
 
103
        -rm --force --recursive keydir confdir
241
104
 
242
 
check:  all
 
105
check:
243
106
        ./mandos --check
244
 
        ./mandos-ctl --check
245
107
 
246
108
# Run the client with a local config and key
247
109
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
110
        ./plugin-runner --plugin-dir=plugins.d \
260
111
                --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)
 
112
                --options-for=password-request:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
263
113
 
264
114
# Used by run-client
265
115
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
267
117
        ./mandos-keygen --dir keydir --force
268
118
 
269
119
# 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)
 
120
run-server: confdir/mandos.conf confdir/clients.conf
 
121
        ./mandos --debug --configdir=confdir
273
122
 
274
123
# Used by run-server
275
124
confdir/mandos.conf: mandos.conf
280
129
        install --mode=u=rw $< $@
281
130
# Add a client password
282
131
        ./mandos-keygen --dir keydir --password >> $@
283
 
statedir:
284
 
        install --directory statedir
285
 
 
286
 
install: install-server install-client-nokey
287
 
 
288
 
install-html: html
289
 
        install --directory $(htmldir)
290
 
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
291
 
                $(htmldocs)
 
132
 
 
133
install: install-server install-client
292
134
 
293
135
install-server: doc
294
 
        install --directory $(CONFDIR)
295
 
        install --directory --mode=u=rwx --owner=$(USER) \
296
 
                --group=$(GROUP) $(STATEDIR)
 
136
        install --directory $(CONFDIR) $(MANDIR)/man5 \
 
137
                $(MANDIR)/man8
297
138
        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
139
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
303
140
                mandos.conf
304
141
        install --mode=u=rw --target-directory=$(CONFDIR) \
305
142
                clients.conf
306
 
        install --mode=u=rw,go=r dbus-mandos.conf \
307
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
308
 
        install --mode=u=rwx,go=rx init.d-mandos \
309
 
                $(DESTDIR)/etc/init.d/mandos
310
 
        install --mode=u=rw,go=r default-mandos \
311
 
                $(DESTDIR)/etc/default/mandos
312
 
        if [ -z $(DESTDIR) ]; then \
313
 
                update-rc.d mandos defaults 25 15;\
314
 
        fi
 
143
        install --mode=u=rwx,go=rx init.d-mandos /etc/init.d/mandos
 
144
        install --mode=u=rw,go=r default-mandos /etc/default/mandos
 
145
        update-rc.d mandos defaults
315
146
        gzip --best --to-stdout mandos.8 \
316
147
                > $(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
148
        gzip --best --to-stdout mandos.conf.5 \
322
149
                > $(MANDIR)/man5/mandos.conf.5.gz
323
150
        gzip --best --to-stdout mandos-clients.conf.5 \
324
151
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
325
 
        gzip --best --to-stdout intro.8mandos \
326
 
                > $(MANDIR)/man8/intro.8mandos.gz
327
152
 
328
 
install-client-nokey: all doc
329
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
330
 
        install --directory --mode=u=rwx $(KEYDIR) \
 
153
install-client: all doc /usr/share/initramfs-tools/hooks/.
 
154
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
 
155
                $(MANDIR)/man8
 
156
        install --directory --mode=u=rwx $(KEYDIR)
 
157
        install --directory --mode=u=rwx \
331
158
                $(PREFIX)/lib/mandos/plugins.d
332
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
159
        if [ "$(CONFDIR)/plugins.d" \
 
160
                        != "$(PREFIX)/lib/mandos/plugins.d" ]; then \
333
161
                install --mode=u=rwx \
334
162
                        --directory "$(CONFDIR)/plugins.d"; \
335
163
        fi
336
 
        install --mode=u=rwx,go=rx --directory \
337
 
                "$(CONFDIR)/network-hooks.d"
338
164
        install --mode=u=rwx,go=rx \
339
165
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
340
166
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
344
170
                plugins.d/password-prompt
345
171
        install --mode=u=rwxs,go=rx \
346
172
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
347
 
                plugins.d/mandos-client
348
 
        install --mode=u=rwxs,go=rx \
 
173
                plugins.d/password-request
 
174
        install --mode=u=rwx,go=rx \
349
175
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
350
176
                plugins.d/usplash
351
 
        install --mode=u=rwxs,go=rx \
352
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
353
 
                plugins.d/splashy
354
 
        install --mode=u=rwxs,go=rx \
355
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
356
 
                plugins.d/askpass-fifo
357
 
        install --mode=u=rwxs,go=rx \
358
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
359
 
                plugins.d/plymouth
360
177
        install initramfs-tools-hook \
361
 
                $(INITRAMFSTOOLS)/hooks/mandos
362
 
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
363
 
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
 
178
                /usr/share/initramfs-tools/hooks/mandos
 
179
        install initramfs-tools-hook-conf \
 
180
                /usr/share/initramfs-tools/conf-hooks.d/mandos
364
181
        install initramfs-tools-script \
365
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
182
                /usr/share/initramfs-tools/scripts/local-top/mandos
366
183
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
367
184
        gzip --best --to-stdout mandos-keygen.8 \
368
185
                > $(MANDIR)/man8/mandos-keygen.8.gz
369
186
        gzip --best --to-stdout plugin-runner.8mandos \
370
187
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
371
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
372
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
373
188
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
374
189
                > $(MANDIR)/man8/password-prompt.8mandos.gz
375
 
        gzip --best --to-stdout plugins.d/usplash.8mandos \
376
 
                > $(MANDIR)/man8/usplash.8mandos.gz
377
 
        gzip --best --to-stdout plugins.d/splashy.8mandos \
378
 
                > $(MANDIR)/man8/splashy.8mandos.gz
379
 
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
380
 
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
381
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
382
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
383
 
 
384
 
install-client: install-client-nokey
 
190
        gzip --best --to-stdout plugins.d/password-request.8mandos \
 
191
                > $(MANDIR)/man8/password-request.8mandos.gz
385
192
# Post-installation stuff
386
193
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
387
194
        update-initramfs -k all -u
391
198
 
392
199
uninstall-server:
393
200
        -rm --force $(PREFIX)/sbin/mandos \
394
 
                $(PREFIX)/sbin/mandos-ctl \
395
 
                $(PREFIX)/sbin/mandos-monitor \
396
201
                $(MANDIR)/man8/mandos.8.gz \
397
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
398
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
399
202
                $(MANDIR)/man5/mandos.conf.5.gz \
400
203
                $(MANDIR)/man5/mandos-clients.conf.5.gz
401
204
        update-rc.d -f mandos remove
405
208
# Refuse to uninstall client if /etc/crypttab is explicitly configured
406
209
# to use it.
407
210
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
408
 
                $(DESTDIR)/etc/crypttab
 
211
                /etc/crypttab
409
212
        -rm --force $(PREFIX)/sbin/mandos-keygen \
410
213
                $(PREFIX)/lib/mandos/plugin-runner \
411
214
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
412
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
215
                $(PREFIX)/lib/mandos/plugins.d/password-request \
413
216
                $(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 \
417
 
                $(INITRAMFSTOOLS)/hooks/mandos \
418
 
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
419
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
217
                /usr/share/initramfs-tools/hooks/mandos \
 
218
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
 
219
                /usr/share/initramfs-tools/scripts/local-top/mandos \
 
220
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
420
221
                $(MANDIR)/man8/mandos-keygen.8.gz \
421
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
422
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
423
222
                $(MANDIR)/man8/password-prompt.8mandos.gz \
424
 
                $(MANDIR)/man8/usplash.8mandos.gz \
425
 
                $(MANDIR)/man8/splashy.8mandos.gz \
426
 
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
427
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
223
                $(MANDIR)/man8/password-request.8mandos.gz
428
224
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
429
225
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
430
226
        update-initramfs -k all -u
433
229
 
434
230
purge-server: uninstall-server
435
231
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
436
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
437
 
                $(DESTDIR)/etc/default/mandos \
438
 
                $(DESTDIR)/etc/init.d/mandos \
439
 
                $(DESTDIR)/var/run/mandos.pid
 
232
                /etc/default/mandos /etc/init.d/mandos \
 
233
                /var/run/mandos.pid
440
234
        -rmdir $(CONFDIR)
441
235
 
442
236
purge-client: uninstall-client